summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-12-02 19:52:28 +0100
committerJose <jose@zeroc.com>2014-12-02 19:52:28 +0100
commitde4789df6f7579c03ae82d087679a398dde3cda0 (patch)
treec1041a4dc5d0e9b565c57b71ffa0e1412b4a759f /scripts/TestUtil.py
parentFixed for testicedist.py to only test supported language mappings for a given... (diff)
downloadice-de4789df6f7579c03ae82d087679a398dde3cda0.tar.bz2
ice-de4789df6f7579c03ae82d087679a398dde3cda0.tar.xz
ice-de4789df6f7579c03ae82d087679a398dde3cda0.zip
Use icebox32 for linux x86 source builds
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index d9931d42e33..b4ecb3ebe9a 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -736,7 +736,7 @@ def getIceBox():
iceBox += "d"
iceBox += ".exe"
elif isLinux():
- if x86:
+ if not x64:
iceBox += "32"
if cpp11:
iceBox += "++11"
@@ -1747,7 +1747,7 @@ def getTestEnv(lang, testdir):
else:
print("warning: could not detect Ice Third party installation.")
else:
- addClasspath(os.path.join("/" "usr" "share", "java", "lib", "db.jar"), env)
+ addClasspath(os.path.join("/", "usr", "share", "java", "db.jar"), env)
#
# If Ice is installed from RPMs: