diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-09-11 20:34:21 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-09-11 20:34:21 +0000 |
| commit | 587b22683496852e9ad2f8673ff774da03242ac6 (patch) | |
| tree | e764bc30225eac43d58d6fb1345aefc25ea974e9 /java/config/TestUtil.py | |
| parent | Object adapter creation method changes, IceBox changes. (diff) | |
| download | ice-587b22683496852e9ad2f8673ff774da03242ac6.tar.bz2 ice-587b22683496852e9ad2f8673ff774da03242ac6.tar.xz ice-587b22683496852e9ad2f8673ff774da03242ac6.zip | |
Object adapter creation method changes, IceBox fixes.
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index a29885b4bd8..343252e622f 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -106,7 +106,7 @@ def killServers(): pass # Ignore errors, such as non-existing processes. serverPids = [] - + # Only used for C++ programs def getServerPid(serverPipe): @@ -133,8 +133,8 @@ def clientServerTestWithOptions(toplevel, name, additionalServerOptions, additio testdir = os.path.join(toplevel, "test", name) classpath = os.path.join(toplevel, "lib") + sep + os.path.join(testdir, "classes") + sep + \ os.getenv("CLASSPATH", "") - server = "java -ea -classpath \"" + classpath + "\" Server " - client = "java -ea -classpath \"" + classpath + "\" Client " + server = "java -ea -classpath \"" + classpath + "\" Server --Ice.ProgramName=Server " + client = "java -ea -classpath \"" + classpath + "\" Client --Ice.ProgramName=Client " updatedServerOptions = serverOptions.replace("TOPLEVELDIR", toplevel) updatedClientOptions = clientOptions.replace("TOPLEVELDIR", toplevel) @@ -167,8 +167,8 @@ def mixedClientServerTestWithOptions(toplevel, name, additionalServerOptions, ad testdir = os.path.join(toplevel, "test", name) classpath = os.path.join(toplevel, "lib") + sep + os.path.join(testdir, "classes") + sep + \ os.getenv("CLASSPATH", "") - server = "java -ea -classpath \"" + classpath + "\" Server " - client = "java -ea -classpath \"" + classpath + "\" Client " + server = "java -ea -classpath \"" + classpath + "\" Server --Ice.ProgramName=Server " + client = "java -ea -classpath \"" + classpath + "\" Client --Ice.ProgramName=Client " updatedServerOptions = clientServerOptions.replace("TOPLEVELDIR", toplevel) updatedClientOptions = updatedServerOptions @@ -201,7 +201,7 @@ def collocatedTestWithOptions(toplevel, name, additionalOptions): testdir = os.path.join(toplevel, "test", name) classpath = os.path.join(toplevel, "lib") + sep + os.path.join(testdir, "classes") + sep + \ os.getenv("CLASSPATH", "") - collocated = "java -ea -classpath \"" + classpath + "\" Collocated " + collocated = "java -ea -classpath \"" + classpath + "\" Collocated --Ice.ProgramName=Collocated " updatedCollocatedOptions = collocatedOptions.replace("TOPLEVELDIR", toplevel) |