Merge pull request #726 from yamt/typo

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 5c5af37d94c8747b62331ace8f4c5dc035b6591e..2c2665b6449f41cbc5f5456f154eeab217e960bf 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -2,13 +2,14 @@ set ::global_overrides {}
 set ::tags {}
 set ::valgrind_errors {}
 
 set ::tags {}
 set ::valgrind_errors {}
 

-proc error_and_quit {config_file error} {
-    puts "!!COULD NOT START REDIS-SERVER\n"
-    puts "CONFIGURATION:"
-    puts [exec cat $config_file]
-    puts "\nERROR:"
-    puts [string trim $error]
-    exit 1
+proc start_server_error {config_file error} {
+    set err {}
+    append err "Cant' start the Redis server\n"
+    append err "CONFIGURATION:"
+    append err [exec cat $config_file]
+    append err "\nERROR:"
+    append err [string trim $error]
+    send_data_packet $::test_server_fd err $err

 }
 
 proc check_valgrind_errors stderr {
 }
 
 proc check_valgrind_errors stderr {


@@ -16,13 +17,10 @@ proc check_valgrind_errors stderr {
     set buf [read $fd]
     close $fd
 
     set buf [read $fd]
     close $fd
 

-    if {![regexp -- {ERROR SUMMARY: 0 errors} $buf] ||
+    if {[regexp -- { at 0x} $buf] ||

         (![regexp -- {definitely lost: 0 bytes} $buf] &&
          ![regexp -- {no leaks are possible} $buf])} {
         (![regexp -- {definitely lost: 0 bytes} $buf] &&
          ![regexp -- {no leaks are possible} $buf])} {

-        puts "*** VALGRIND ERRORS ***"
-        puts $buf
-        puts "-----------------------"
-        append ::valgrind_errors "$buf\n\n"
+        send_data_packet $::test_server_fd err "Valgrind error: $buf\n"

     }
 }
 
     }
 }
 


@@ -48,11 +46,16 @@ proc kill_server config {
     }
 
     # kill server and wait for the process to be totally exited
     }
 
     # kill server and wait for the process to be totally exited

+    catch {exec kill $pid}

     while {[is_alive $config]} {
     while {[is_alive $config]} {

-        if {[incr wait 10] % 1000 == 0} {
+        incr wait 10
+
+        if {$wait >= 5000} {
+            puts "Forcing process $pid to exit..."
+            catch {exec kill -KILL $pid}
+        } elseif {$wait % 1000 == 0} {

             puts "Waiting for process $pid to exit..."
         }
             puts "Waiting for process $pid to exit..."
         }

-        catch {exec kill $pid}

         after 10
     }
 
         after 10
     }
 


@@ -104,7 +107,7 @@ 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
+    # If we are running against an external server, we just push the

     # host/port pair in the stack the first time
     if {$::external} {
         if {[llength $::servers] == 0} {
     # host/port pair in the stack the first time
     if {$::external} {
         if {[llength $::servers] == 0} {


@@ -157,7 +160,8 @@ proc start_server {options {code undefined}} {
     dict set config dir [tmpdir server]
     
     # start every server on a different port
     dict set config dir [tmpdir server]
     
     # start every server on a different port

-    dict set config port [incr ::port]
+    set ::port [find_available_port [expr {$::port+1}]]
+    dict set config port $::port

 
     # apply overrides from global space and arguments
     foreach {directive arguments} [concat $::global_overrides $overrides] {
 
     # apply overrides from global space and arguments
     foreach {directive arguments} [concat $::global_overrides $overrides] {


@@ -177,14 +181,14 @@ 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 --suppressions=src/valgrind.sup src/redis-server $config_file > $stdout 2> $stderr &
+        exec valgrind --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/redis-server $config_file > $stdout 2> $stderr &

     } else {
         exec src/redis-server $config_file > $stdout 2> $stderr &
     }
     
     # check that the server actually started
     # ugly but tries to be as fast as possible...
     } else {
         exec src/redis-server $config_file > $stdout 2> $stderr &
     }
     
     # check that the server actually started
     # ugly but tries to be as fast as possible...

-    set retrynum 20
+    if {$::valgrind} {set retrynum 1000} else {set retrynum 100}

     set serverisup 0
 
     if {$::verbose} {
     set serverisup 0
 
     if {$::verbose} {


@@ -211,7 +215,10 @@ proc start_server {options {code undefined}} {
     }
 
     if {!$serverisup} {
     }
 
     if {!$serverisup} {

-        error_and_quit $config_file [exec cat $stderr]
+        set err {}
+        append err [exec cat $stdout] "\n" [exec cat $stderr]
+        start_server_error $config_file $err
+        return

     }
     
     # find out the pid
     }
     
     # find out the pid


@@ -245,7 +252,7 @@ proc start_server {options {code undefined}} {
 
         while 1 {
             # check that the server actually started and is ready for connections
 
         while 1 {
             # check that the server actually started and is ready for connections

-            if {[exec cat $stdout | grep "ready to accept" | wc -l] > 0} {
+            if {[exec grep "ready to accept" | wc -l < $stdout] > 0} {

                 break
             }
             after 10
                 break
             }
             after 10