diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-06-08 02:22:42 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-06-08 02:22:42 +0000 |
| commit | a60f1f651d60e48cc4f4a8e477c5b7813d24418d (patch) | |
| tree | ab6fb426a1cad77c9ba865799e542fda62e8d4b1 /cpp/config/TestUtil.py | |
| parent | Removed substition ".cpp" -> ".cs". This is now done by slice2cs itself. (diff) | |
| download | ice-a60f1f651d60e48cc4f4a8e477c5b7813d24418d.tar.bz2 ice-a60f1f651d60e48cc4f4a8e477c5b7813d24418d.tar.xz ice-a60f1f651d60e48cc4f4a8e477c5b7813d24418d.zip | |
AIX port
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index 70cabe91546..726b6afb36c 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -91,7 +91,13 @@ def isHpUx(): return 1 else: return 0 - + +def isAIX(): + if sys.platform in ['aix4', 'aix5']: + return 1 + else: + return 0 + def isDarwin(): if sys.platform == "darwin": @@ -145,7 +151,7 @@ def getAdapterReady(serverPipe): def waitServiceReady(pipe, token): - while True: + while 1: output = pipe.readline().strip() @@ -158,7 +164,7 @@ def waitServiceReady(pipe, token): def printOutputFromPipe(pipe): - while True: + while 1: line = pipe.readline() @@ -183,6 +189,8 @@ elif isHpUx(): os.environ["SHLIB_PATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("SHLIB_PATH", "") elif isDarwin(): os.environ["DYLD_LIBRARY_PATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("DYLD_LIBRRARY_PATH", "") +elif isAIX(): + os.environ["LIBPATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LIBPATH", "") else: os.environ["LD_LIBRARY_PATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH", "") os.environ["LD_LIBRARY_PATH_64"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH_64", "") @@ -233,7 +241,7 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona testdir = os.path.join(toplevel, "test", name) server = os.path.join(testdir, serverName) client = os.path.join(testdir, clientName) - + print "starting " + serverName + "...", serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getServerPid(serverPipe) |