diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-01-05 09:17:44 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-01-05 09:17:44 +0100 |
| commit | 5469080ad5f8ef40b5eb071a96dde4bea931c7cf (patch) | |
| tree | 05704a61a7166e450b74c4e8f20e9ab6aac04379 /scripts/TestUtil.py | |
| parent | Bug 4578: Application::main not safe (diff) | |
| download | ice-5469080ad5f8ef40b5eb071a96dde4bea931c7cf.tar.bz2 ice-5469080ad5f8ef40b5eb071a96dde4bea931c7cf.tar.xz ice-5469080ad5f8ef40b5eb071a96dde4bea931c7cf.zip | |
Fixed 4577 - CLASSPATH not correctly set for Java tests
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 6fb89a9bd69..38c3375d207 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -205,9 +205,6 @@ def configurePaths(): addClasspath(os.path.join(javaDir, "IceE.jar")) os.environ["CLASSPATH"] = os.path.join(javaDir, "IceE.jar") + os.pathsep + os.getenv("CLASSPATH", "") else: - # The IceTest.jar is never installed, and so will always live - # in the toplevel java/lib directory. - addClasspath(os.path.join(toplevel, "java", "lib", "IceTest.jar")) # The Ice.jar and Freeze.jar comes from the installation # directory or the toplevel dir. javaDir = os.path.join(getIceDir("java"), "lib") @@ -1253,7 +1250,7 @@ def getTestEnv(lang, testdir): if lang == "cpp": addLdPath(os.path.join(testdir), env) elif lang == "java": - addClasspath(os.path.join(testdir, "classes"), env) + addClasspath(os.path.join(toplevel, "java", "lib", "IceTest.jar")) return env; def getTestName(): |