diff options
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index b85e064012f..709cc3eee7d 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -176,20 +176,24 @@ def clientServerTestWithOptions(additionalServerOptions, additionalClientOptions def clientServerTestWithClasspath(serverClasspath, clientClasspath): + server = "java -ea Server --Ice.ProgramName=Server" + client = "java -ea Client --Ice.ProgramName=Client" + classpath = os.getenv("CLASSPATH", "") scp = serverClasspath + sep + classpath ccp = clientClasspath + sep + classpath - server = "java -ea -cp '" + scp + "' Server --Ice.ProgramName=Server" - client = "java -ea -cp '" + ccp + "' Client --Ice.ProgramName=Client" - print "starting server...", + os.environ["CLASSPATH"] = scp serverPipe = os.popen(server + serverOptions) + os.environ["CLASSPATH"] = classpath getAdapterReady(serverPipe) print "ok" print "starting client...", + os.environ["CLASSPATH"] = ccp clientPipe = os.popen(client + clientOptions) + os.environ["CLASSPATH"] = classpath print "ok" printOutputFromPipe(clientPipe) |