diff options
Diffstat (limited to 'cpp/test/Glacier2/attack/run.py')
| -rwxr-xr-x | cpp/test/Glacier2/attack/run.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index 651dbde6d91..8e7e52d05df 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -20,17 +20,17 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil -router = os.path.join(toplevel, "bin", "glacier2router") +router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") -command = router + TestUtil.clientServerOptions + \ - r' --Glacier2.RoutingTable.MaxSize=10' + \ +args = r' --Glacier2.RoutingTable.MaxSize=10' + \ r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Ice.Admin.InstanceName=Glacier2' + \ - r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"' + r' --Glacier2.CryptPasswords="' + TestUtil.getMappingDir(__file__) + \ + r'/test/Glacier2/attack/passwords" 2>&1' print "starting router...", -starterPipe = os.popen(command + " 2>&1") +starterPipe = TestUtil.startServer(router, args) TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" |