diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-06-01 14:51:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-06-01 14:51:13 +0200 |
| commit | c72fd1f8d80c07fc09564e9acea41b36c81c07fa (patch) | |
| tree | 438b4b0c3064d6ec7e38f9a0e5b75f337928dc4e /scripts | |
| parent | WinRT SDK header fixes (diff) | |
| download | ice-c72fd1f8d80c07fc09564e9acea41b36c81c07fa.tar.bz2 ice-c72fd1f8d80c07fc09564e9acea41b36c81c07fa.tar.xz ice-c72fd1f8d80c07fc09564e9acea41b36c81c07fa.zip | |
Fixed test env for PHP brew and Java on Windows
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index d4d533ca67b..26499530f4d 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -744,6 +744,9 @@ def phpSetup(clientConfig = False, iceOptions = None, iceProfile = None): incDir = "/usr/share/php5" else: incDir = None + elif iceHome == "/usr/local" and isDarwin(): + extDir = "/usr/local/lib/php/extensions" + incDir = "/usr/local/share/php" else: print("unable to find IcePHP extension!") sys.exit(1) @@ -1869,6 +1872,8 @@ def getTestEnv(lang, testdir): # C++ extensions (py, ruby, php) # if isWin32(): + if lang == "java": + addLdPath(os.path.join(getIceDir("cpp"), "bin"), env) # Always add bin for db53_vc100.dll addLdPath(getCppLibDir(lang), env) elif lang in ["python", "ruby", "php", "js", "objective-c"]: addLdPath(getCppLibDir(lang), env) |