diff options
| author | Joe George <joe@zeroc.com> | 2016-10-04 09:55:23 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-10-04 09:55:23 -0400 |
| commit | f7d175cd8f3ed2594be6be6e783c39b63b887650 (patch) | |
| tree | 0bcd696bdeca940d5290fb280f916078b1018cfb /scripts/TestUtil.py | |
| parent | Fixed (ICE-7404) - js Ice/binding hung on Windows with Chrome (diff) | |
| download | ice-f7d175cd8f3ed2594be6be6e783c39b63b887650.tar.bz2 ice-f7d175cd8f3ed2594be6be6e783c39b63b887650.tar.xz ice-f7d175cd8f3ed2594be6be6e783c39b63b887650.zip | |
Fix ICE-7384 - Wrong db.jar path in CLASSPATH
Diffstat (limited to 'scripts/TestUtil.py')
| -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 6f68bcca00c..6f90c0bca94 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1984,10 +1984,10 @@ def getTestEnv(lang, testdir): addClasspath(os.path.join(pkgdir, "berkeley.db.java7", "build", "native", "lib", "db.jar"), env) elif isDarwin(): - if os.path.exists('/usr/local/opt/ice/libexec/lib'): + if os.path.exists('/usr/local/opt/berkeley-db53/lib'): + addClasspath(os.path.join("/", "usr", "local", "opt", "berkeley-db53", "lib", "db.jar"), env) + elif: os.path.exists('/usr/local/opt/ice/libexec/lib'): addClasspath(os.path.join("/", "usr", "local", "opt", "ice", "libexec", "lib", "db.jar"), env) - else: - addClasspath(os.path.join("/", "usr", "local", "opt", "berkeley-db53", "db.jar"), env) else: addClasspath(os.path.join("/", "usr", "share", "java", "db.jar"), env) |