Merge remote branch 'visionmedia/cli-help' into cli-help

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

diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index 298e4c77932a06b2ff2639c14b084c697a6edcfd..e801e1f228ea91946dd8d68ae4bfd722bcdcf52a 100644 (file)
--- a/tests/support/test.tcl
+++ b/tests/support/test.tcl
@@ -36,8 +36,8 @@ proc assert_encoding {enc key} {
     # Swapped out values don't have an encoding, so make sure that
     # the value is swapped in before checking the encoding.
     set dbg [r debug object $key]
-    while {[string match "* swapped:*" $dbg]} {
-        [r debug swapin $key]
+    while {[string match "* swapped at:*" $dbg]} {
+        r debug swapin $key
         set dbg [r debug object $key]
     }
     assert_match "* encoding:$enc *" $dbg
@@ -90,8 +90,10 @@ proc test {name code {okpattern notspecified}} {
         }
     }
     if {$::traceleaks} {
-        if {![string match {*0 leaks*} [exec leaks redis-server]]} {
+        set output [exec leaks redis-server]
+        if {![string match {*0 leaks*} $output]} {
             puts "--------- Test $::testnum LEAKED! --------"
+            puts $output
             exit 1
         }
     }