diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 13:44:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 13:44:19 +0100 |
| commit | d983678e16e64d495957a2c47ff1ed3a767009be (patch) | |
| tree | 28de64aff7bf6e184dabab9d6dc67117865cbf2a /scripts/TestUtil.py | |
| parent | Fixes for ICE-6031 and ICE-6049: better timings for timeout test (diff) | |
| download | ice-d983678e16e64d495957a2c47ff1ed3a767009be.tar.bz2 ice-d983678e16e64d495957a2c47ff1ed3a767009be.tar.xz ice-d983678e16e64d495957a2c47ff1ed3a767009be.zip | |
Fixed ICE-6046: VC110 C# Glacier2/router test failure because no VC120 x64 runtime installed
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 5eda3d9c885..34b1312b3a6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1643,8 +1643,7 @@ def getCppBinDir(lang = None): if iceHome: if lang == None: lang = getDefaultMapping() - if lang == "cpp" or lang == "php": - if isVC110(): + if isVC110() and lang != "py": binDir = os.path.join(binDir, "vc110") if x64: if isSolaris(): @@ -1654,8 +1653,7 @@ def getCppBinDir(lang = None): binDir = os.path.join(binDir, "amd64") elif isWin32() and lang != "php": binDir = os.path.join(binDir, "x64") - if isDarwin() and cpp11: - binDir = os.path.join(binDir, "c++11") + return binDir def getSliceTranslator(lang = "cpp"): |