diff options
Diffstat (limited to 'cpp/test/Glacier2/router/run.py')
| -rwxr-xr-x | cpp/test/Glacier2/router/run.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index a7106d66159..0edaed9d6f6 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -20,24 +20,23 @@ 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' --Ice.Warn.Dispatch=0' + \ - r' --Ice.Warn.Connections=0' + \ - r' --Glacier2.Filter.Category.Accept="c1 c2"' + \ - r' --Glacier2.Filter.Category.AcceptUser="2"' + \ - r' --Glacier2.SessionTimeout="30"' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -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/router/passwords"' +args = r' --Ice.Warn.Dispatch=0' + \ + r' --Ice.Warn.Connections=0' + \ + r' --Glacier2.Filter.Category.Accept="c1 c2"' + \ + r' --Glacier2.Filter.Category.AcceptUser="2"' + \ + r' --Glacier2.SessionTimeout="30"' + \ + r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.Admin.InstanceName="Glacier2"' + \ + r' --Glacier2.CryptPasswords="' + TestUtil.getMappingDir(__file__) + r'/test/Glacier2/router/passwords"' print "starting router...", if TestUtil.debug: print "(" + command + ")", -starterPipe = os.popen(command + " 2>&1") +starterPipe = TestUtil.startServer(router, args + " 2>&1") TestUtil.getServerPid(starterPipe) # # For this test we don't want to add the router to the server threads |