diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-05-05 15:50:21 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-05-05 15:50:21 -0230 |
| commit | 9f82f9524eb7f9d296d0b78b48425617efdfe878 (patch) | |
| tree | 1c1426f4eea9bb937d80449718feafd2f45ca423 /scripts/TestUtil.py | |
| parent | Bug 1594 - some more byte sequence optimizations (diff) | |
| download | ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.tar.bz2 ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.tar.xz ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.zip | |
Bug 3624 - desupport HP
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 69762dcca9f..fd277b178dc 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -56,9 +56,6 @@ def isSparc(): else: return False -def isHpUx(): - return sys.platform == "hp-ux11" - def isAIX(): return sys.platform in ['aix4', 'aix5'] @@ -154,9 +151,7 @@ def configurePaths(): else: libDir = os.path.join(getIceDir("cpp"), "lib") if iceHome and x64: - if isHpUx(): - libDir = os.path.join(libDir, "pa20_64") - elif isSolaris(): + if isSolaris(): if isSparc(): libDir = os.path.join(libDir, "sparcv9") else: @@ -196,9 +191,6 @@ def addLdPath(libpath, env = None): env = os.environ if isWin32(): addPathToEnv("PATH", libpath, env) - elif isHpUx(): - addPathToEnv("SHLIB_PATH", libpath, env) - addPathToEnv("LD_LIBRARY_PATH", libpath, env) elif isDarwin(): addPathToEnv("DYLD_LIBRARY_PATH", libpath, env) elif isAIX(): @@ -978,9 +970,7 @@ def simpleTest(exe, options = ""): def getCppBinDir(): binDir = os.path.join(getIceDir("cpp"), "bin") if iceHome and x64: - if isHpUx(): - binDir = os.path.join(binDir, "pa20_64") - elif isSolaris(): + if isSolaris(): if isSparc(): binDir = os.path.join(binDir, "sparcv9") else: |