diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-06-11 18:37:51 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-06-11 18:37:51 +0200 |
| commit | 86b8ed7a65febff2231fa99f5bba65ae234a685a (patch) | |
| tree | ee77299d86f261f7ae273b66327e16653429c0eb /scripts/TestUtil.py | |
| parent | Fix ICE-6587: Secure transport leaks (diff) | |
| download | ice-86b8ed7a65febff2231fa99f5bba65ae234a685a.tar.bz2 ice-86b8ed7a65febff2231fa99f5bba65ae234a685a.tar.xz ice-86b8ed7a65febff2231fa99f5bba65ae234a685a.zip | |
Fixed test PATH issue on Windows (ICE-6591)
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 723ffe24b38..5342cad411f 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1006,7 +1006,7 @@ def getCommandLineProperties(exe, config): # all test drivers. # components = ["--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1"] - + if config.lang == "cpp": components.append("--Ice.CollectObjects=1") @@ -1107,7 +1107,7 @@ def getCommandLine(exe, config, options = "", interpreterOptions = ""): output.write("mono --debug '%s.exe' " % exe) elif config.lang == "ruby" and config.type == "client": # - # If running with a binary distribution ensure rubygems + # If running with a binary distribution ensure rubygems # are enabled # if iceHome: @@ -1883,7 +1883,7 @@ def getTestEnv(lang, testdir): # if isWin32(): if lang == "java": - addLdPath(os.path.join(getIceDir("cpp"), "bin"), env) # Always add bin for db53_vc100.dll + addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll addLdPath(getCppLibDir(lang), env) elif lang in ["python", "ruby", "php", "js", "objective-c"]: addLdPath(getCppLibDir(lang), env) |