fixed a bug in rdbLoadObject abount specially encoded objects

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 419267b4b0f26803d3eb75c6fdc774097bb93853..0c9f48ce9cd30caec2db51b325133836f94cde9f 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -1,3 +1,6 @@
+set ::global_overrides {}
+set ::tags {}
+
 proc error_and_quit {config_file error} {
     puts "!!COULD NOT START REDIS-SERVER\n"
     puts "CONFIGURATION:"
@@ -30,9 +33,11 @@ proc kill_server config {
     if {![dict exists $config "skipleaks"]} {
         catch {
             if {[string match {*Darwin*} [exec uname -a]]} {
-                test "Check for memory leaks (pid $pid)" {
-                    exec leaks $pid
-                } {*0 leaks*}
+                tags {"leaks"} {
+                    test "Check for memory leaks (pid $pid)" {
+                        exec leaks $pid
+                    } {*0 leaks*}
+                }
             }
         }
     }
@@ -80,18 +85,31 @@ proc ping_server {host port} {
     return $retval
 }
 
-set ::global_overrides {}
+# doesn't really belong here, but highly coupled to code in start_server
+proc tags {tags code} {
+    set ::tags [concat $::tags $tags]
+    uplevel 1 $code
+    set ::tags [lrange $::tags 0 end-[llength $tags]]
+}
+
 proc start_server {options {code undefined}} {
     # setup defaults
     set baseconfig "default.conf"
     set overrides {}
+    set tags {}
 
     # parse options
     foreach {option value} $options {
         switch $option {
-            "config" { set baseconfig $value }
-            "overrides" { set overrides $value }
-            default { error "Unknown option $option" }
+            "config" {
+                set baseconfig $value }
+            "overrides" {
+                set overrides $value }
+            "tags" {
+                set tags $value
+                set ::tags [concat $::tags $value] }
+            default {
+                error "Unknown option $option" }
         }
     }
 
@@ -190,7 +208,12 @@ proc start_server {options {code undefined}} {
         lappend ::servers $srv
         
         # execute provided block
+        set curnum $::testnum
         catch { uplevel 1 $code } err
+        if {$curnum == $::testnum} {
+            # don't check for leaks when no tests were executed
+            dict set srv "skipleaks" 1
+        }
 
         # pop the server object
         set ::servers [lrange $::servers 0 end-1]
@@ -215,8 +238,10 @@ proc start_server {options {code undefined}} {
             exit 1
         }
 
+        set ::tags [lrange $::tags 0 end-[llength $tags]]
         kill_server $srv
     } else {
+        set ::tags [lrange $::tags 0 end-[llength $tags]]
         set _ $srv
     }
 }