diff options
Diffstat (limited to 'java/test/Ice/threads/run.py')
| -rwxr-xr-x | java/test/Ice/threads/run.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/test/Ice/threads/run.py b/java/test/Ice/threads/run.py index e7f3c9671bf..a706c0c33b3 100755 --- a/java/test/Ice/threads/run.py +++ b/java/test/Ice/threads/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 @@ -20,15 +20,15 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil -if TestUtil.iceSslVersion == "1.4": +if TestUtil.getIceSSLVersion() == "1.4": print "Detected IceSSL version that requires thread-per-connection, skipping test." sys.exit(0) name = os.path.join("Ice", "threads") -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.clientServerTest() +os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + classpath +TestUtil.clientServerTest(name) sys.exit(0) |