diff options
| author | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
| commit | 3e685a12bfd92a4ffd86c808ba0f34df907de5c8 (patch) | |
| tree | 2ef8fb8e028d4f14d1516a98f2a18dbadb46a5d7 /scripts/TestUtil.py | |
| parent | Update to latest gradle builder (diff) | |
| parent | AIX port (diff) | |
| download | ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.bz2 ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.xz ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 982c3221521..38841895312 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -128,7 +128,7 @@ def isSparc(): return False def isAIX(): - return sys.platform in ['aix4', 'aix5'] + return sys.platform.startswith("aix") def isDarwin(): return sys.platform == "darwin" @@ -342,6 +342,9 @@ toplevel = path[0] if isWin32(): if os.environ.get("PLATFORM", "").upper() == "X64": x64 = True +elif isAIX(): + if os.environ.get("OBJECT_MODE", "") == "64": + x64 = True else: p = subprocess.Popen("uname -m", shell = True, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) if(p.wait() != 0): @@ -1925,7 +1928,10 @@ def getTestEnv(lang, testdir): if lang == "java": addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll addLdPath(getCppLibDir(lang), env) + 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 addLdPath(getCppLibDir(lang), env) if lang == "java": |