diff options
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 3c5060dfad0..b2a2524f77a 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -119,7 +119,7 @@ def isI686(): return x86 or any(platform.machine() == p for p in ["i386", "i686"]) def isAIX(): - return sys.platform in ['aix4', 'aix5'] + return sys.platform.startswith("aix") def isDarwin(): return sys.platform == "darwin" @@ -331,6 +331,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): @@ -1972,7 +1975,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": |