Fixed ICE-7213 - Glacier2 router test hang with C# (missing bzip2 dll in the PATH)

1 files changed, 8 insertions, 11 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 8e53ca72e14..2eee1d6c901 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1912,17 +1912,14 @@ 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"
-            platform = "x64" if x64 else "Win32"
-            pkgdir = os.path.join(getIceDir("cpp"), "third-party-packages")
-            pkgsubdir = os.path.join("build", "native", "bin", platform)
-
-            if isMINGW():
-                addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.mingw4.7.2", pkgsubdir), env)
-            if lang == "java" and javaLibraryPath:
-                addPathToEnv("PATH", javaLibraryPath, env)
+    if isWin32():
+        if lang == "java" and javaLibraryPath:
+            addPathToEnv("PATH", javaLibraryPath, env)
+
+        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 Ice is installed on the system, set the CLASSPATH for Java and