unstable merge conflicts resolved

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 4f48d22dcafbd023acde952340890bc262a7ee10..c92754611536f16f78ad2a885a94540d279fe6e1 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -214,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
     }