From: antirez <antirez@gmail.com>
Date: Wed, 15 Dec 2010 10:52:55 +0000 (+0100)
Subject: Merge remote branch 'pietern/string-patches'
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/53f0efe28c4fe2f8d15286c02ccd2d83a5195fc9?hp=7d5f5712d948b19d0778e4ef53a27d213aff7bdc

Merge remote branch 'pietern/string-patches'
---

diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index 153ba1e3..724646a3 100644
--- a/tests/support/test.tcl
+++ b/tests/support/test.tcl
@@ -44,6 +44,60 @@ 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
+        } elseif {[lsearch $tags hash] != -1} {
+            set colorcode {32}
+            set ch H
+        } elseif {[lsearch $tags set] != -1} {
+            set colorcode {33}
+            set ch S
+        } elseif {[lsearch $tags zset] != -1} {
+            set colorcode {34}
+            set ch Z
+        } elseif {[lsearch $tags basic] != -1} {
+            set colorcode {35}
+            set ch B
+        } else {
+            set colorcode {37}
+            set ch .
+        }
+        if {$colorcode ne {}} {
+            if {$passed} {
+                puts -nonewline "\033\[0;${colorcode};40m"
+            } else {
+                puts -nonewline "\033\[7;${colorcode};40m"
+            }
+            puts -nonewline $ch
+            puts -nonewline "\033\[0m"
+            flush stdout
+        }
+    } else {
+        if {$passed} {
+            puts -nonewline .
+        } else {
+            puts -nonewline F
+        }
+    }
+}
+
 proc test {name code {okpattern undefined}} {
     # abort if tagged with a tag to deny
     foreach tag $::denytags {
@@ -75,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]} {
@@ -88,7 +144,7 @@ proc test {name code {okpattern undefined}} {
                 puts "FAILED"
                 puts "$msg\n"
             } else {
-                puts -nonewline "F"
+                colored_dot $::tags 0
             }
         } else {
             # Re-raise, let handler up the stack take care of this.
@@ -100,7 +156,7 @@ proc test {name code {okpattern undefined}} {
             if {$::verbose} {
                 puts "PASSED"
             } else {
-                puts -nonewline "."
+                colored_dot $::tags 1
             }
         } else {
             set msg "Expected '$okpattern' to equal or match '$retval'"
@@ -112,7 +168,7 @@ proc test {name code {okpattern undefined}} {
                 puts "FAILED"
                 puts "$msg\n"
             } else {
-                puts -nonewline "F"
+                colored_dot $::tags 0
             }
         }
     }