diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-10 17:46:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-10 17:46:47 +0200 |
| commit | 9cceea9619f254b411c49afe92c6c82d9247a3b6 (patch) | |
| tree | 002933fe4831e7ee56967ded9a471a4b5d84df2c /scripts/TestUtil.py | |
| parent | Fixed ICE-7140 - Objective-C build failure following 3.6 merge (diff) | |
| download | ice-9cceea9619f254b411c49afe92c6c82d9247a3b6.tar.bz2 ice-9cceea9619f254b411c49afe92c6c82d9247a3b6.tar.xz ice-9cceea9619f254b411c49afe92c6c82d9247a3b6.zip | |
Fix for 7134 - disable OpenSSL initialization for IcePHP & Ubuntu
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 38841895312..c105967412d 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -946,9 +946,12 @@ if isWin32(): sslConfigTree["python"] = sslConfigTree["cpp"] sslConfigTree["ruby"] = sslConfigTree["cpp"] -sslConfigTree["php"] = sslConfigTree["cpp"] +sslConfigTree["php"] = sslConfigTree["cpp"].copy() sslConfigTree["objective-c"] = sslConfigTree["cpp"] +if isUbuntu(): + sslConfigTree["php"]["client"] += " --IceSSL.InitOpenSSL=0" + def getDefaultMapping(): """Try to guess the language mapping from the current path""" here = os.getcwd().split(os.sep) @@ -1931,7 +1934,7 @@ def getTestEnv(lang, testdir): elif isAIX(): addLdPath(getCppLibDir(lang), env) elif lang in ["python", "ruby", "php", "js", "objective-c"]: - # C++ binaries use rpath $ORIGIN or similar to find the Ice libraries + # C++ binaries use rpath $ORIGIN or similar to find the Ice libraries addLdPath(getCppLibDir(lang), env) if lang == "java": |