From 307a4054b85e27ee3ec012c72541f4480f71b05e Mon Sep 17 00:00:00 2001 From: Joe George Date: Mon, 26 Sep 2016 15:22:23 -0400 Subject: Fix ICE-7384 - Java Freeze test failures on macOS --- scripts/TestUtil.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/TestUtil.py') 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: -- cgit v1.2.3