diff options
Diffstat (limited to 'java/test/Ice/package/run.py')
| -rwxr-xr-x | java/test/Ice/package/run.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/test/Ice/package/run.py b/java/test/Ice/package/run.py index 1684ab1230f..1ddc88437b4 100755 --- a/java/test/Ice/package/run.py +++ b/java/test/Ice/package/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,8 +21,8 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil name = os.path.join("Ice", "package") -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", "") -TestUtil.clientServerTest() +TestUtil.clientServerTest(name) sys.exit(0) |