summaryrefslogtreecommitdiff
path: root/java/test/IceSSL/configuration/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'java/test/IceSSL/configuration/run.py')
-rwxr-xr-xjava/test/IceSSL/configuration/run.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py
index da69fffa48d..812223556a3 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/IceSSL/configuration/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,9 +21,9 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("IceSSL", "configuration")
-testdir = os.path.join(toplevel, "test", name)
+testdir = os.path.dirname(os.path.abspath(__file__))
classpath = os.getenv("CLASSPATH", "")
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath
-TestUtil.clientServerTestWithOptions("", " " + testdir)
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + classpath
+TestUtil.clientServerTestWithOptions(name, "", " " + testdir)
sys.exit(0)