summaryrefslogtreecommitdiff
path: root/java/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-03-02 17:55:31 +0000
committerMarc Laukien <marc@zeroc.com>2004-03-02 17:55:31 +0000
commita88ac782d5035f1c3b2a40e3292d44525f692911 (patch)
treec8b1d9deaeede62b8f2494433d8f891d07e70af8 /java/config/TestUtil.py
parentminor (diff)
downloadice-a88ac782d5035f1c3b2a40e3292d44525f692911.tar.bz2
ice-a88ac782d5035f1c3b2a40e3292d44525f692911.tar.xz
ice-a88ac782d5035f1c3b2a40e3292d44525f692911.zip
fix
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r--java/config/TestUtil.py10
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)