diff options
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 877fb9b0ce5..e25a9082cb8 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1601,14 +1601,15 @@ def getTestEnv(lang, testdir): if iceHome == "/usr": if lang == "java": javaDir = os.path.join("/", "usr", "share", "java") - addClasspath(os.path.join(javaDir, "Ice.jar"), env) - addClasspath(os.path.join(javaDir, "Glacier2.jar"), env) - addClasspath(os.path.join(javaDir, "Freeze.jar"), env) - addClasspath(os.path.join(javaDir, "IceBox.jar"), env) - addClasspath(os.path.join(javaDir, "IceStorm.jar"), env) - addClasspath(os.path.join(javaDir, "IceGrid.jar"), env) - addClasspath(os.path.join(javaDir, "IcePatch2.jar"), env) - addClasspath(os.path.join(javaDir, "IceDiscovery.jar"), env) + jarSuffix = "-" + getIceVersion() + ".jar" + addClasspath(os.path.join(javaDir, "Ice" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "Glacier2" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "Freeze" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceBox" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceStorm" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceGrid" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IcePatch2" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceDiscovery" + jarSuffix), env) return env # That's it, we're done! if isWin32(): |