diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-12-15 21:51:11 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-12-15 21:51:11 -0330 |
| commit | 2f80c0576bfca8f1aa1700bef4d5905c15abc6f5 (patch) | |
| tree | a57a5b1e2eb236395fc5f86321f160fd57cd7695 /scripts/TestUtil.py | |
| parent | Updates to ice.spec: (diff) | |
| download | ice-2f80c0576bfca8f1aa1700bef4d5905c15abc6f5.tar.bz2 ice-2f80c0576bfca8f1aa1700bef4d5905c15abc6f5.tar.xz ice-2f80c0576bfca8f1aa1700bef4d5905c15abc6f5.zip | |
http://bugzilla/bugzilla/show_bug.cgi?id=4477 - bug 4477.
- No longer possible to build the java tests with USE_BIN_DIST=yes.
- TestUtil.py didn't setup the CLASSPATH correctly for IceTest.jar.
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 91eb683e70f..ea4c3c23e88 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -205,6 +205,11 @@ 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") addClasspath(os.path.join(javaDir, "Ice.jar")) addClasspath(os.path.join(javaDir, "Freeze.jar")) |