Merge remote branch 'pietern/string-patches'

[redis.git] / tests / support / test.tcl

diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index c70cc049a9750cc0649a8af97b450d1cf76a84d6..724646a3a1a1d604e31a63922223e68c6711824b 100644 (file)
--- a/tests/support/test.tcl
+++ b/tests/support/test.tcl
@@ -44,8 +44,22 @@ proc assert_type {type key} {
     assert_equal $type [r type $key]
 }
 
+# This is called before starting the test
+proc announce_test {s} {
+    if {[info exists ::env(TERM)] && [string match $::env(TERM) xterm]} {
+        puts -nonewline "$s\033\[0K"
+        flush stdout
+        set ::backward_count [string length $s]
+    }
+}
+
+# This is called after the test finished
 proc colored_dot {tags passed} {
     if {[info exists ::env(TERM)] && [string match $::env(TERM) xterm]} {
+        # Go backward and delete what announc_test function printed.
+        puts -nonewline "\033\[${::backward_count}D\033\[0K\033\[J"
+
+        # Print a coloured char, accordingly to test outcome and tags.
         if {[lsearch $tags list] != -1} {
             set colorcode {31}
             set ch L
@@ -69,7 +83,7 @@ proc colored_dot {tags passed} {
             if {$passed} {
                 puts -nonewline "\033\[0;${colorcode};40m"
             } else {
-                puts -nonewline "\033\[0;40;${colorcode}m"
+                puts -nonewline "\033\[7;${colorcode};40m"
             }
             puts -nonewline $ch
             puts -nonewline "\033\[0m"
@@ -115,6 +129,8 @@ proc test {name code {okpattern undefined}} {
     if {$::verbose} {
         puts -nonewline [format "#%03d %-68s " $::num_tests $name]
         flush stdout
+    } else {
+        announce_test $name
     }
 
     if {[catch {set retval [uplevel 1 $code]} error]} {