diff options
| author | Joe George <joe@zeroc.com> | 2016-09-26 15:22:23 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-09-26 15:23:37 -0400 |
| commit | 307a4054b85e27ee3ec012c72541f4480f71b05e (patch) | |
| tree | 5c6b3ad865158ea35d5fcedde45fe554bd1355ea | |
| parent | Fixed restore of saved maximized window (diff) | |
| download | ice-307a4054b85e27ee3ec012c72541f4480f71b05e.tar.bz2 ice-307a4054b85e27ee3ec012c72541f4480f71b05e.tar.xz ice-307a4054b85e27ee3ec012c72541f4480f71b05e.zip | |
Fix ICE-7384 - Java Freeze test failures on macOS
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 88106dd8519..b32626b4f54 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1839,10 +1839,10 @@ def getJavaLibraryPath(): return ("-Djava.library.path=\"%s\" " % os.path.join(getIceDir("cpp"), "third-party-packages", "berkeley.db.java7", "build", "native", "bin", "x64" if x64 else "Win32")) elif isDarwin(): - if os.path.exists('/usr/local/opt/ice/libexec/lib'): - return "-Djava.library.path=/usr/local/opt/ice/libexec/lib " - else: + if os.path.exists('/usr/local/opt/berkeley-db53/lib'): return "-Djava.library.path=/usr/local/opt/berkeley-db53/lib " + elif os.path.exists('/usr/local/opt/ice/libexec/lib'): + return "-Djava.library.path=/usr/local/opt/ice/libexec/lib " elif isRhel() or isSles(): libpath = ("/usr/lib64" if x64 else "/usr/lib") if "LD_LIBRARY_PATH" in os.environ: |