diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
commit | 04c83affba981565fcca3b3bfa2a3d96ca331c81 (patch) | |
tree | 8cf749969ff9209645130bb8e4433d837c77c6d6 /scripts/TestUtil.py | |
parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
parent | Fixed Glacier2 bug which would cause hang on shutdown (diff) | |
download | ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.bz2 ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.xz ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index b466b903923..d892088db82 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1881,7 +1881,6 @@ def getTestEnv(lang, testdir): if os.environ.get("USE_BIN_DIST", "no") != "yes": addPathToEnv("NODE_PATH", os.path.join(getIceDir("js", testdir), "src"), env) - if isWin32() and lang in ["cpp", "java", "csharp", "python", "ruby", "php"]: if not iceHome: configuration = "Debug" if buildMode == "debug" else "Release" |