summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-12-11 22:10:52 +0100
committerJose <jose@zeroc.com>2014-12-11 22:10:52 +0100
commit329c7b43cd6b2a4e486c857ef915ecb0cd946a8b (patch)
tree4d9adda8ffcf822ae193051e1abd639fbecffc1f /scripts/TestUtil.py
parentICE-6149 Android test suite crashes on binding test w/ ws (diff)
downloadice-329c7b43cd6b2a4e486c857ef915ecb0cd946a8b.tar.bz2
ice-329c7b43cd6b2a4e486c857ef915ecb0cd946a8b.tar.xz
ice-329c7b43cd6b2a4e486c857ef915ecb0cd946a8b.zip
Fixed (ICE-6103) - Java IceGrid/simple failure on Win7 x64 no VC
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index cba162fdf9a..5980da630a2 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1193,10 +1193,7 @@ def isDebug():
# we assume is a release build or bin dist, tests that depends on debug
# or release (C++) need to create the build.txt file.
#
- exe = "icebox"
- if isWin32():
- exe += ".exe"
- return not os.path.isfile(os.path.join(getCppBinDir("cpp"), "icebox"))
+ return not os.path.isfile(os.path.join(getCppBinDir("cpp"), "icebox%s" % (".exe" if isWin32() else "")))
import Expect