diff options
| author | Jose <jose@zeroc.com> | 2014-11-21 21:19:34 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-21 21:19:34 +0100 |
| commit | e797dd66033ae76378435e6e6462901365c97bf4 (patch) | |
| tree | 53b3da4bea28e1f7e8a342e73e452da5b28dcf0b /scripts/TestUtil.py | |
| parent | added note about 32/64 bit DB utilities (diff) | |
| download | ice-e797dd66033ae76378435e6e6462901365c97bf4.tar.bz2 ice-e797dd66033ae76378435e6e6462901365c97bf4.tar.xz ice-e797dd66033ae76378435e6e6462901365c97bf4.zip | |
Fix for java.library.path setting
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 24beba87447..60760d321a0 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1670,16 +1670,17 @@ def getCppLibDir(lang = None): def getJavaLibraryPath(): if isWin32(): - if iceHome: - return "-Djava.library.path=\"%s\" " % os.path.join(iceHome, "bin\\x64" if x64 else "bin") + if iceHome: + return "-Djava.library.path=%s " % os.path.join(iceHome, "bin\\x64" if x64 else "bin") else: - return "-Djava.library.path=\"%s\" " % os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin") + return "-Djava.library.path=%s " % (os.path.join(getThirdpartyHome(), "bin", "x64") if x64 else + os.path.join(getThirdpartyHome(), "bin")) elif isDarwin(): - return "-Djava.library.path=\"%s\" " % os.path.join(iceHome if iceHome else getThirdpartyHome(), "lib") + return "-Djava.library.path=%s " % os.path.join(iceHome if iceHome else getThirdpartyHome(), "lib") elif isRhel() or isSles(): - return "-Djava.library.path=\"%s\" " % "/usr/lib64" if x64 else "/usr/lib" + return "-Djava.library.path=%s " % ("/usr/lib64" if x64 else "/usr/lib") elif isUbuntu(): - return "-Djava.library.path=\"%s\" " % "/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu" + return "-Djava.library.path=%s " % ("/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu") return None def getServiceDir(): |