Configurable synchronous I/O timeout

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index ad711e6ee224f382bcf80a3ceba4a2b279cd4c5f..c92754611536f16f78ad2a885a94540d279fe6e1 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -177,9 +177,6 @@ proc start_server {options {code undefined}} {
     if {$::valgrind} {
         exec valgrind --suppressions=src/valgrind.sup src/redis-server $config_file > $stdout 2> $stderr &
     } else {
-        if {$::verbose} {
-            puts "Logging on $stdout / $stderr"
-        }
         exec src/redis-server $config_file > $stdout 2> $stderr &
     }
     
@@ -217,7 +214,7 @@ proc start_server {options {code undefined}} {
     
     # find out the pid
     while {![info exists pid]} {
-        regexp {^\[(\d+)\]} [exec head -n1 $stdout] _ pid
+        regexp {\[(\d+)\]} [exec cat $stdout] _ pid
         after 100
     }