diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-11-17 10:32:39 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-11-17 10:32:39 -0330 |
| commit | d3b5b5593d0afeda0b28a0bc959587f8fba7c1fb (patch) | |
| tree | d6b855c50aa2db4d80df3515e635dc4db4730059 /scripts/TestUtil.py | |
| parent | Revert changes to Bison generated files (diff) | |
| download | ice-d3b5b5593d0afeda0b28a0bc959587f8fba7c1fb.tar.bz2 ice-d3b5b5593d0afeda0b28a0bc959587f8fba7c1fb.tar.xz ice-d3b5b5593d0afeda0b28a0bc959587f8fba7c1fb.zip | |
ICE-5451 fix bzip2 warnings with x86 C# tests on x64 platforms
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 6b9d32508d0..31267173200 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -318,7 +318,7 @@ def run(tests, root = False): opts, args = getopt.getopt(sys.argv[1:], "lr:R:", ["start=", "start-after=", "filter=", "rfilter=", "all", "all-cross", "loop", "debug", "protocol=", "compress", "valgrind", "host=", "serialize", "continue", - "ipv6", "no-ipv6", "socks", "ice-home=", "cross=", "client-home=", "x64", "x86", + "ipv6", "no-ipv6", "socks", "ice-home=", "cross=", "client-home=", "x64", "x86", "script", "env", "arg=", "service-dir=", "appverifier", "compact", "silverlight", "winrt", "server", "mx", "c++11"]) @@ -1623,6 +1623,10 @@ def getTestEnv(lang, testdir): # First sanitize the environment. env["CLASSPATH"] = sanitize(os.getenv("CLASSPATH", "")) + # Make sure bzip2 can be found by x86 C# builds on x64 platforms + if lang == "cs" and not x64: + addPathToEnv("PATH", os.path.join(getCppBinDir("cs"), "x64"), env) + # Add test directory to env if lang == "cpp": addLdPath(os.path.join(testdir), env) |