diff options
| author | Joe George <joe@zeroc.com> | 2014-12-05 09:52:34 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-12-05 09:53:16 -0500 |
| commit | 5be8ba3352d49b3d3d4b98362d3f89538688bc2f (patch) | |
| tree | 97eb8d9f297e0c34bece637d02ebf0ee12c4eb1c /scripts/TestUtil.py | |
| parent | Additional fix for ICE-6050, Ice/hold JS failure (diff) | |
| download | ice-5be8ba3352d49b3d3d4b98362d3f89538688bc2f.tar.bz2 ice-5be8ba3352d49b3d3d4b98362d3f89538688bc2f.tar.xz ice-5be8ba3352d49b3d3d4b98362d3f89538688bc2f.zip | |
ICE-6005 - Fix TestUtil hanging while trying to shutdown
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 5665dc9c066..ee54840a045 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1198,7 +1198,7 @@ def isDebug(): return open(os.path.join(os.getcwd(), "build.txt"), "r").read().strip() == "debug" # # Try to guess, if icebox release executable exists in the C++ bin dir - # we assume is a release build or bin dist, tests that depends on debug + # we assume is a release build or bin dist, tests that depends on debug # or release (C++) need to create the build.txt file. # exe = "icebox" @@ -1735,7 +1735,7 @@ def getJavaLibraryPath(): if iceHome: return "-Djava.library.path=%s " % os.path.join(iceHome, "lib") elif thirdPartyHome: - return "-Djava.library.path=%s " % os.path.join(thirdPartyHome, "lib") + return "-Djava.library.path=%s " % os.path.join(thirdPartyHome, "lib") elif isRhel() or isSles(): return "-Djava.library.path=%s " % ("/usr/lib64" if x64 else "/usr/lib") elif isUbuntu(): |