diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-07-13 16:17:56 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-07-13 16:17:56 +0200 |
| commit | 987c15fa95d5dfd30439186247fb35148ff3041f (patch) | |
| tree | 2bf73d4d7021f6669ca844918735658c72cc26e1 /scripts/TestUtil.py | |
| parent | Fix ifdef typo (diff) | |
| download | ice-987c15fa95d5dfd30439186247fb35148ff3041f.tar.bz2 ice-987c15fa95d5dfd30439186247fb35148ff3041f.tar.xz ice-987c15fa95d5dfd30439186247fb35148ff3041f.zip | |
Fixed for 7213 - Added check for VC120 to add PATH for Bzip2 library
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2e561e207c5..8861aecb8a9 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1919,7 +1919,10 @@ def getTestEnv(lang, testdir): if lang == "csharp" and not iceHome: pkgdir = os.path.join(getIceDir("cpp"), "msbuild", "packages") pkgsubdir = os.path.join("build", "native", "bin", "x64", "Release") - addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.v140.1.0.6.4", pkgsubdir), env) + if isVC120(): + addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.v120.1.0.6.4", pkgsubdir), env) + else: + addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.v140.1.0.6.4", pkgsubdir), env) # # If Ice is installed on the system, set the CLASSPATH for Java and |