diff options
Diffstat (limited to 'java/test/Glacier/starter/run.py')
| -rwxr-xr-x | java/test/Glacier/starter/run.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/java/test/Glacier/starter/run.py b/java/test/Glacier/starter/run.py index 23d0a0493e4..d20698d729e 100755 --- a/java/test/Glacier/starter/run.py +++ b/java/test/Glacier/starter/run.py @@ -34,11 +34,7 @@ ice_home = os.environ['ICE_HOME'] starter = os.path.join(ice_home, "bin", "glacierstarter") router = os.path.join(ice_home, "bin", "glacierrouter") -updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel) -updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) -updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) - -command = starter + updatedClientServerOptions + \ +command = starter + TestUtil.clientServerOptions + \ r' --Ice.PrintProcessId' \ r' --Glacier.Starter.RouterPath=' + router + \ r' --Glacier.Starter.PropertiesOverwrite=Ice.ServerIdleTime=10' \ @@ -55,11 +51,14 @@ TestUtil.getAdapterReady(starterPipe) print "ok" name = os.path.join("Glacier", "starter") -TestUtil.mixedClientServerTest(toplevel, name) +testdir = os.path.join(toplevel, "test", name) +os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.environ["CLASSPATH"] + +TestUtil.mixedClientServerTest(name) -# We run the test again, to check whether the glacier starter can -# start up multiple routers. -TestUtil.mixedClientServerTest(toplevel, name) +# We run the test again, to check whether the glacier router starter +# can start up multiple routers. +TestUtil.mixedClientServerTest(name) print "shutting down glacier starter...", TestUtil.killServers() # TODO: Graceful shutdown. |