diff options
| author | Jose <jose@zeroc.com> | 2014-10-18 00:20:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-18 00:20:24 +0200 |
| commit | f2b099b01e6f90e86410bdb2d4e0068307de12e0 (patch) | |
| tree | 8a87d247be5274258f58c8a752b26324671abf1b /scripts/TestUtil.py | |
| parent | Dependency fixes: (diff) | |
| download | ice-f2b099b01e6f90e86410bdb2d4e0068307de12e0.tar.bz2 ice-f2b099b01e6f90e86410bdb2d4e0068307de12e0.tar.xz ice-f2b099b01e6f90e86410bdb2d4e0068307de12e0.zip | |
Distribution updates
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index da63f74d105..846df273ed6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1544,7 +1544,7 @@ def getCppBinDir(lang = None): if iceHome: if lang == None: lang = getDefaultMapping() - if lang == "cpp": + if lang == "cpp" or lang == "php": if isVC110(): binDir = os.path.join(binDir, "vc110") if x64: @@ -1553,7 +1553,7 @@ def getCppBinDir(lang = None): binDir = os.path.join(binDir, "sparcv9") else: binDir = os.path.join(binDir, "amd64") - elif isWin32() and lang != "php" and lang != "rb": + elif isWin32() and lang != "php": binDir = os.path.join(binDir, "x64") if isDarwin() and cpp11: binDir = os.path.join(binDir, "c++11") @@ -1654,7 +1654,10 @@ def getTestEnv(lang, testdir): addPathToEnv("PYTHONPATH", pythonDir, env) if lang == "rb": - addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby"), env) + if isWin32() and x64: + addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby", "x64"), env) + else: + addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby"), env) if lang == "js": addPathToEnv("NODE_PATH", os.path.join(getIceDir("js", testdir), "src"), env) |