diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-28 13:43:20 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-28 13:43:20 -0230 |
| commit | 7cf59a08ed627e9f52363146be5c14ecc8a1f8ca (patch) | |
| tree | 092c0c5170794875ae7d3592c2f485c1d67092e2 /scripts/TestUtil.py | |
| parent | Fixed error from bug 4198 fix (diff) | |
| download | ice-7cf59a08ed627e9f52363146be5c14ecc8a1f8ca.tar.bz2 ice-7cf59a08ed627e9f52363146be5c14ecc8a1f8ca.tar.xz ice-7cf59a08ed627e9f52363146be5c14ecc8a1f8ca.zip | |
Bug 4184 - use DEVPATH instead of relying on *.exe.config
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 56e3f27b810..5a189ace276 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -132,13 +132,13 @@ def dumpenv(env, lang): env = os.environ vars = ["PATH", "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH", "SHLIB_PATH", "LIBPATH", "LD_LIBRARY_PATH_64"] if lang == None: - vars.extend(["CLASSPATH", "MONO_PATH", "PYTHONPATH", "RUBYLIB"]) + vars.extend(["CLASSPATH", "MONO_PATH", "DEVPATH", "PYTHONPATH", "RUBYLIB"]) elif lang == "cpp": pass elif lang == "java": vars.append("CLASSPATH") elif lang == "cs": - vars.append("MONO_PATH") + vars.extend(["MONO_PATH", "DEVPATH"]) elif lang == "py": vars.append("PYTHONPATH") elif lang == "rb": @@ -193,7 +193,9 @@ def configurePaths(): # # On Windows, C# assemblies are found thanks to the .exe.config files. # - if not isWin32(): + if isWin32(): + addPathToEnv("DEVPATH", os.path.join(getIceDir("cs"), "bin")) + else: addPathToEnv("MONO_PATH", os.path.join(getIceDir("cs"), "bin")) # |