From ff20dd34f91fecfc351804605b822999cde0e593 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 3 May 2016 09:03:13 +0200
Subject: AIX port

---
 scripts/TestUtil.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts/TestUtil.py')

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index a838398f1b3..e766ca80622 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -109,7 +109,7 @@ def isSparc():
         return False
 
 def isAIX():
-    return sys.platform in ['aix4', 'aix5']
+    return sys.platform.startswith("aix")
 
 def isDarwin():
     return sys.platform == "darwin"
@@ -318,6 +318,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):
@@ -1964,7 +1967,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":
-- 
cgit v1.2.3