fixed a memory leak in the new Set code

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 0c9f48ce9cd30caec2db51b325133836f94cde9f..24fef4677175cd4202836e48dfdb9a615a8bfacc 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -25,6 +25,9 @@ proc check_valgrind_errors stderr {
 }
 
 proc kill_server config {
 }
 
 proc kill_server config {

+    # nothing to kill when running against external server
+    if {$::external} return
+

     # nevermind if its already dead
     if {![is_alive $config]} { return }
     set pid [dict get $config pid]
     # nevermind if its already dead
     if {![is_alive $config]} { return }
     set pid [dict get $config pid]


@@ -93,6 +96,24 @@ proc tags {tags code} {
 }
 
 proc start_server {options {code undefined}} {
 }
 
 proc start_server {options {code undefined}} {

+    # If we are runnign against an external server, we just push the
+    # host/port pair in the stack the first time
+    if {$::external} {
+        if {[llength $::servers] == 0} {
+            set srv {}
+            dict set srv "host" $::host
+            dict set srv "port" $::port
+            set client [redis $::host $::port]
+            dict set srv "client" $client
+            $client select 9
+
+            # append the server to the stack
+            lappend ::servers $srv
+        }
+        uplevel 1 $code
+        return
+    }
+

     # setup defaults
     set baseconfig "default.conf"
     set overrides {}
     # setup defaults
     set baseconfig "default.conf"
     set overrides {}


@@ -148,10 +169,10 @@ proc start_server {options {code undefined}} {
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
 
     if {$::valgrind} {
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
 
     if {$::valgrind} {

-        exec valgrind ./redis-server $config_file > $stdout 2> $stderr &
+        exec valgrind src/redis-server $config_file > $stdout 2> $stderr &

         after 2000
     } else {
         after 2000
     } else {

-        exec ./redis-server $config_file > $stdout 2> $stderr &
+        exec src/redis-server $config_file > $stdout 2> $stderr &

         after 500
     }
     
         after 500
     }
     


@@ -209,7 +230,11 @@ proc start_server {options {code undefined}} {
         
         # execute provided block
         set curnum $::testnum
         
         # execute provided block
         set curnum $::testnum

-        catch { uplevel 1 $code } err
+        if {![catch { uplevel 1 $code } err]} {
+            # zero exit status is good
+            unset err
+        }
+

         if {$curnum == $::testnum} {
             # don't check for leaks when no tests were executed
             dict set srv "skipleaks" 1
         if {$curnum == $::testnum} {
             # don't check for leaks when no tests were executed
             dict set srv "skipleaks" 1


@@ -220,22 +245,24 @@ proc start_server {options {code undefined}} {
         
         # allow an exception to bubble up the call chain but still kill this
         # server, because we want to reuse the ports when the tests are re-run
         
         # allow an exception to bubble up the call chain but still kill this
         # server, because we want to reuse the ports when the tests are re-run

-        if {$err eq "exception"} {
-            puts [format "Logged warnings (pid %d):" [dict get $srv "pid"]]
-            set warnings [warnings_from_file [dict get $srv "stdout"]]
-            if {[string length $warnings] > 0} {
-                puts "$warnings"
-            } else {
-                puts "(none)"
+        if {[info exists err]} {
+            if {$err eq "exception"} {
+                puts [format "Logged warnings (pid %d):" [dict get $srv "pid"]]
+                set warnings [warnings_from_file [dict get $srv "stdout"]]
+                if {[string length $warnings] > 0} {
+                    puts "$warnings"
+                } else {
+                    puts "(none)"
+                }
+                # kill this server without checking for leaks
+                dict set srv "skipleaks" 1
+                kill_server $srv
+                error "exception"
+            } elseif {[string length $err] > 0} {
+                puts "Error executing the suite, aborting..."
+                puts $err
+                exit 1

             }
             }

-            # kill this server without checking for leaks
-            dict set srv "skipleaks" 1
-            kill_server $srv
-            error "exception"
-        } elseif {[string length $err] > 0} {
-            puts "Error executing the suite, aborting..."
-            puts $err
-            exit 1

         }
 
         set ::tags [lrange $::tags 0 end-[llength $tags]]
         }
 
         set ::tags [lrange $::tags 0 end-[llength $tags]]