summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/faultTolerance/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/faultTolerance/run.py')
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 151f149d27a..e06b110f939 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -32,13 +32,10 @@ client = os.path.join(testdir, "client")
num = 6
base = 12340
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
serverPipes = { }
for i in range(0, num):
print "starting server #%d..." % (i + 1),
- serverPipes[i] = os.popen(server + updatedServerOptions + " %d" % (base + i))
+ serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i))
TestUtil.getServerPid(serverPipes[i])
TestUtil.getAdapterReady(serverPipes[i])
print "ok"
@@ -47,7 +44,7 @@ ports = ""
for i in range(0, num):
ports = "%s %d" % (ports, base + i)
print "starting client...",
-clientPipe = os.popen(client + updatedClientOptions + " " + ports)
+clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
print "ok"
for output in clientPipe.xreadlines():