diff options
author | Bernard Normier <bernard@zeroc.com> | 2004-05-06 01:09:57 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2004-05-06 01:09:57 +0000 |
commit | 7b707395300fcf7615fc0d38e7cf4f7fe4d0d7d4 (patch) | |
tree | 68f58388b3971cd6238d220d0dba0a99f0d4cbc4 /java/test/Ice/exceptions/run.py | |
parent | fix in OA::deactivate() (diff) | |
download | ice-7b707395300fcf7615fc0d38e7cf4f7fe4d0d7d4.tar.bz2 ice-7b707395300fcf7615fc0d38e7cf4f7fe4d0d7d4.tar.xz ice-7b707395300fcf7615fc0d38e7cf4f7fe4d0d7d4.zip |
Switched back to popen (from popen4)
Diffstat (limited to 'java/test/Ice/exceptions/run.py')
-rwxr-xr-x | java/test/Ice/exceptions/run.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 456e532004d..5f6c6bb40fb 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -41,20 +41,18 @@ client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath -(serverPipeIn, serverPipe) = os.popen4(server + TestUtil.serverOptions) +serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1") TestUtil.getAdapterReady(serverPipe) print "ok" print "starting client...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath -(clientPipeIn, clientPipe) = os.popen4(client + TestUtil.clientOptions) +clientPipe = os.popen(client + TestUtil.clientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) -clientInStatus = clientPipeIn.close() clientStatus = clientPipe.close() -serverInStatus = serverPipeIn.close() serverStatus = serverPipe.close() -if clientInStatus or serverInStatus: +if clientStatus or serverStatus: TestUtil.killServers() sys.exit(1) |