diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-11-24 09:34:47 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-11-24 09:34:47 -0330 |
| commit | c83f4beae4cb773ea7bf9ff77efd4a645032c6d8 (patch) | |
| tree | faca54249a43ce2a4a22487212447ade8edf3a97 /scripts/TestUtil.py | |
| parent | Additional fix for ICE-5966 (diff) | |
| download | ice-c83f4beae4cb773ea7bf9ff77efd4a645032c6d8.tar.bz2 ice-c83f4beae4cb773ea7bf9ff77efd4a645032c6d8.tar.xz ice-c83f4beae4cb773ea7bf9ff77efd4a645032c6d8.zip | |
Fixed java library.path setting on Windows again
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 58d3ad1f6f3..66c0e25f362 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1688,13 +1688,12 @@ 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 - os.path.join(getThirdpartyHome(), "bin")) + return "-Djava.library.path=\"%s\" " % os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "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") elif isUbuntu(): |