summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 648ee7e026c..008d3b123ea 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -44,13 +44,18 @@ def clientServerTest(toplevel, name):
print "starting client...",
clientPipe = os.popen(os.path.join(testdir, "client"))
- output = clientPipe.read().strip()
+ output = clientPipe.readline()
if not output:
- print "failed!"
- killServers()
- sys.exit(0)
+ print "failed!"
+ TestUtil.killServers()
+ sys.exit(0)
print "ok"
- print output
+ print output,
+ while 1:
+ output = clientPipe.readline()
+ if not output:
+ break;
+ print output,
def collocatedTest(toplevel, name):