diff options
| author | Jose <jose@zeroc.com> | 2015-03-04 22:21:43 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-03-04 22:21:43 +0100 |
| commit | 65d01cf9994708f173f50841d28e3a5c74a38ba2 (patch) | |
| tree | aeb80adbc72db5735ba8c1210e63493691bfff28 /scripts/TestUtil.py | |
| parent | IceUtil/Atomic.h doesn't build with MINGW (diff) | |
| download | ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.tar.bz2 ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.tar.xz ice-65d01cf9994708f173f50841d28e3a5c74a38ba2.zip | |
Support to build Ruby MINGW from git
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 986b1b7f8ab..434780bddfc 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1713,7 +1713,7 @@ def getCppBinDir(lang = None): return binDir def getSliceTranslator(lang = "cpp"): - return os.path.join(os.path.join(iceHome if iceHome else getIceDir("cpp"), "bin") , "slice2%s" % lang) + return os.path.join((iceHome if iceHome else getIceDir("cpp")) , "bin", "slice2%s" % lang) def getCppLibDir(lang = None): if isWin32(): @@ -1860,11 +1860,11 @@ def getTestEnv(lang, testdir): else: addPathToEnv("PYTHONPATH", pythonDir, env) - if lang == "rb": - 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 testing with source dist we need to set RUBYLIB + # + if lang == "rb" and not iceHome: + addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby"), env) if lang == "js": if os.environ.get("USE_BIN_DIST", "no") != "yes": |