X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/d6107fd6f194f568bd0fec3230cae83973de929d..890a2ed989274cb09b5cde1def3935e110ec3cb9:/tests/support/test.tcl diff --git a/tests/support/test.tcl b/tests/support/test.tcl index 153ba1e3..dff2d297 100644 --- a/tests/support/test.tcl +++ b/tests/support/test.tcl @@ -44,6 +44,65 @@ proc assert_type {type key} { assert_equal $type [r type $key] } +# Test if TERM looks like to support colors +proc color_term {} { + expr {[info exists ::env(TERM)] && [string match *xterm* $::env(TERM)]} +} + +# This is called before starting the test +proc announce_test {s} { + if {[color_term]} { + 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 {[color_term]} { + # 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 +134,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 +149,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 +161,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 +173,7 @@ proc test {name code {okpattern undefined}} { puts "FAILED" puts "$msg\n" } else { - puts -nonewline "F" + colored_dot $::tags 0 } } }