summaryrefslogtreecommitdiff
path: root/java/test/Slice/keyword/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'java/test/Slice/keyword/run.py')
-rwxr-xr-xjava/test/Slice/keyword/run.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/test/Slice/keyword/run.py b/java/test/Slice/keyword/run.py
index bebd5b4c61f..622c2b032c4 100755
--- a/java/test/Slice/keyword/run.py
+++ b/java/test/Slice/keyword/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,11 +21,11 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("Slice", "keyword")
-testdir = os.path.join(toplevel, "test", name)
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "")
+testdir = os.path.dirname(os.path.abspath(__file__))
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + os.getenv("CLASSPATH", "")
print "starting client...",
-clientPipe = os.popen(TestUtil.javaCmd + " -ea Client 2>&1")
+clientPipe = os.popen("java -ea Client 2>&1")
print "ok"
TestUtil.printOutputFromPipe(clientPipe)