diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 12:54:14 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 12:54:14 +0100 |
commit | c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084 (patch) | |
tree | dafc2a03552cc57150c215881f95909a7e55cb54 /scripts/TestUtil.py | |
parent | Fixed ICE-5015 - Python 3 support and fix for running ruby/php tests on Windows (diff) | |
download | ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.tar.bz2 ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.tar.xz ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.zip |
Fixed ICE-5020 - x64 libraries now installed in lib/64 on Sparc
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 743c35a0000..730f4e422de 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -67,12 +67,12 @@ def isSolaris(): return sys.platform == "sunos5" def isSparc(): - p = subprocess.Popen("uname -m", stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) - if not process or not process.stdout: + p = subprocess.Popen("uname -p", stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) + if not p or not p.stdout: print("unable to get system information!") sys.exit(1) l = p.stdout.readline().decode("utf-8").strip() - if l == "sun4u": + if l == "sparc": return True else: return False @@ -1436,7 +1436,7 @@ def getTestEnv(lang, testdir): if iceHome and x64: if isSolaris(): if isSparc(): - libDir = os.path.join(libDir, "sparcv9") + libDir = os.path.join(libDir, "64") else: libDir = os.path.join(libDir, "amd64") elif not isDarwin(): |