From: antirez <antirez@gmail.com>
Date: Fri, 15 Apr 2011 14:35:54 +0000 (+0200)
Subject: test fixed after ascii art banner modified the output of a running server
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/72dff2c084ce67464bded6bc9f5674d5e01b2cf7?hp=fb2feae599e2a190cfc6906ca9a03abc54528b61

test fixed after ascii art banner modified the output of a running server
---

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 4f48d22d..c9275461 100644
--- 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
     }
 
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 156ce3c1..c594f6f6 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -127,6 +127,7 @@ proc execute_everything {} {
 #    execute_tests "integration/redis-cli"
     execute_tests "unit/pubsub"
 
+    return; # No diskstore tests for now...
     # run tests with diskstore enabled
     puts "\nRunning diskstore tests... this is slow, press Ctrl+C if not interested.."
     set ::diskstore 1