diff options
Diffstat (limited to 'java/test/Ice/stream/run.py')
| -rwxr-xr-x | java/test/Ice/stream/run.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/test/Ice/stream/run.py b/java/test/Ice/stream/run.py index 84aee281bd2..435a6ef9a34 100755 --- a/java/test/Ice/stream/run.py +++ b/java/test/Ice/stream/run.py @@ -10,7 +10,7 @@ import os, sys -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: +for toplevel in [".", "..", "../..", "../../..", "../../../..", "../../../../.."]: toplevel = os.path.normpath(toplevel) if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): break @@ -21,13 +21,11 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil name = os.path.join("Ice", "stream") -testdir = os.path.join(toplevel, "test", name) -os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "") - -client = TestUtil.javaCmd + " -ea Client --Ice.ProgramName=Client " +testdir = os.path.dirname(os.path.abspath(__file__)) +os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + os.getenv("CLASSPATH", "") print "starting test...", -clientPipe = os.popen(client + TestUtil.clientOptions + " 2>&1") +clientPipe = TestUtil.startClient("Client"," 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) |