5 files changed, 6 insertions, 12 deletions
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index dc18f80256d..5b579189936 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -33,10 +33,7 @@ base = 12340
 
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    commandLine = TestUtil.getCommandLine(server, TestUtil.DriverConfig("server")) + " %d" % (base + i)
-    if TestUtil.isDebug():
-        print "(" + commandLine + ")",
-    serverPipe = os.popen(commandLine + " 2>&1")
+    serverPipe = TestUtil.startServer(server, "%d" % (base + i))
     TestUtil.getServerPid(serverPipe)
     TestUtil.getAdapterReady(serverPipe)
     print "ok"
@@ -46,10 +43,7 @@ for i in range(0, num):
     ports = "%s %d" % (ports, base + i)
 
 print "starting client...",
-commandLine = TestUtil.getCommandLine(client, TestUtil.DriverConfig("client")) + " " + ports
-if TestUtil.isDebug():
-    print "(" + commandLine + ")",
-clientPipe = os.popen(commandLine + " 2>&1")
+clientPipe = TestUtil.startClient(client, ports)
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py
index 011684a5e3b..bef91a20641 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -28,7 +28,7 @@ client = os.path.join(testdir, "client")
 
 print "starting client...",
 seedfile = testdir + "/seed"
-clientPipe = os.popen(TestUtil.getCommandLine(client, TestUtil.DriverConfig("client"), TestUtil.getTestEnv()) + " " + seedfile + " 2>&1")
+clientPipe = TestUtil.startClient(client, seedfile)
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
diff --git a/cpp/test/Ice/interceptor/run.py b/cpp/test/Ice/interceptor/run.py
index 579120a0d0c..60ee1442e7b 100755
--- a/cpp/test/Ice/interceptor/run.py
+++ b/cpp/test/Ice/interceptor/run.py
@@ -26,7 +26,7 @@ testdir = os.path.dirname(os.path.abspath(__file__))
 client = os.path.join(testdir, "client")
 
 print "starting client...",
-clientPipe = os.popen(client + " --Ice.Warn.Dispatch=0 2>&1")
+clientPipe = TestUtil.startClient(client, " --Ice.Warn.Dispatch=0")
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe);
diff --git a/cpp/test/Ice/stream/run.py b/cpp/test/Ice/stream/run.py
index a8d95e0d012..05426ad10cc 100755
--- a/cpp/test/Ice/stream/run.py
+++ b/cpp/test/Ice/stream/run.py
@@ -24,7 +24,7 @@ TestUtil.processCmdLine()
 client = os.path.join(os.path.dirname(os.path.abspath(__file__)), "client")
 
 print "starting test...",
-clientPipe = os.popen(TestUtil.getCommandLine(client, TestUtil.DriverConfig("client")) + " 2>&1")
+clientPipe = TestUtil.startClient(client, "")
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
diff --git a/cpp/test/Ice/stringConverter/run.py b/cpp/test/Ice/stringConverter/run.py
index 1e05abd1220..2625cd6ad55 100755
--- a/cpp/test/Ice/stringConverter/run.py
+++ b/cpp/test/Ice/stringConverter/run.py
@@ -26,7 +26,7 @@ testdir = os.path.dirname(os.path.abspath(__file__))
 client = os.path.join(testdir, "client")
 
 print "starting client...",
-clientPipe = os.popen(client + " 2>&1")
+clientPipe = TestUtil.startClient(client, "")
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe);