summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-09-20 13:22:51 +0200
committerBenoit Foucher <benoit@zeroc.com>2013-09-20 13:22:51 +0200
commit4ec061f4c207d57b87aa7742426b923755981d67 (patch)
tree98d9b77d7d776f2d4572aa2566be4dd87454c506 /scripts/TestUtil.py
parentminor fix to upgrade VS2012 demo projects (diff)
downloadice-4ec061f4c207d57b87aa7742426b923755981d67.tar.bz2
ice-4ec061f4c207d57b87aa7742426b923755981d67.tar.xz
ice-4ec061f4c207d57b87aa7742426b923755981d67.zip
Minor fix to demoscripts Util.py, PATH fix for TestUtil.py
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index bb94678e6c8..d4d3448b136 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1439,7 +1439,7 @@ def getCppBinDir(lang = None):
binDir = os.path.join(binDir, "sparcv9")
else:
binDir = os.path.join(binDir, "amd64")
- elif isWin32():
+ elif isWin32() and lang != "php" and lang != "rb":
binDir = os.path.join(binDir, "x64")
if isDarwin() and cpp11:
binDir = os.path.join(binDir, "c++11")