diff options
Diffstat (limited to 'cpp/test/Ice/faultTolerance/run.py')
| -rwxr-xr-x | cpp/test/Ice/faultTolerance/run.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 595816f79ff..36e62ea064d 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -21,7 +21,8 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil name = os.path.join("Ice", "faultTolerance") -testdir = os.path.join(toplevel, "test", name) + +testdir = os.path.dirname(os.path.abspath(__file__)) server = os.path.join(testdir, "server") client = os.path.join(testdir, "client") @@ -31,7 +32,7 @@ base = 12340 for i in range(0, num): print "starting server #%d..." % (i + 1), - serverPipe = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1") + serverPipe = os.popen(TestUtil.getCommandLine(server, TestUtil.DriverConfig("server")) + " %d" % (base + i) + " 2>&1") TestUtil.getServerPid(serverPipe) TestUtil.getAdapterReady(serverPipe) print "ok" @@ -41,7 +42,7 @@ for i in range(0, num): ports = "%s %d" % (ports, base + i) print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1") +clientPipe = os.popen(TestUtil.getCommandLine(client, TestUtil.DriverConfig("client")) + " " + ports + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) |