summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-28 16:35:32 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-28 16:35:32 +0100
commitce3ba5f554bb622c35e3f5e2416da24f145f9a0a (patch)
treee42f403bc40617aa29aa2e43f84f60dfc4264128 /scripts/TestUtil.py
parentICE-5023 overwire .Addin files (diff)
downloadice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.tar.bz2
ice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.tar.xz
ice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.zip
Better fix for running VS2012 tests against installation
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 8fceaaff952..03555dfa4da 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1381,6 +1381,8 @@ def createConfig(path, lines, enc=None):
def getCppBinDir(lang = None):
binDir = os.path.join(getIceDir("cpp"), "bin")
if iceHome:
+ if lang == None:
+ lang = getDefaultMapping()
if lang == "cpp" and isVS2012():
binDir = os.path.join(binDir, "vc110")
if x64: