summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-10-04 01:14:21 +0200
committerJose <jose@zeroc.com>2012-10-04 01:14:21 +0200
commit665a97daa28197171bd1707ec855e586838ae193 (patch)
tree2e74198f9052b62d70840d1029d1a39fee1eff67 /scripts/TestUtil.py
parentice_getHash deprecation fixes (diff)
downloadice-665a97daa28197171bd1707ec855e586838ae193.tar.bz2
ice-665a97daa28197171bd1707ec855e586838ae193.tar.xz
ice-665a97daa28197171bd1707ec855e586838ae193.zip
ICE-4723 - IceBox.dll and icebox.exe conflict
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index ffb02963acb..66abe03578b 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -231,9 +231,9 @@ def configurePaths():
# On Windows, C# assemblies are found thanks to the .exe.config files.
#
if isWin32():
- addPathToEnv("DEVPATH", os.path.join(getIceDir("cs"), "bin"))
+ addPathToEnv("DEVPATH", os.path.join(getIceDir("cs"), "Assemblies"))
else:
- addPathToEnv("MONO_PATH", os.path.join(getIceDir("cs"), "bin"))
+ addPathToEnv("MONO_PATH", os.path.join(getIceDir("cs"), "Assemblies"))
#
# On Windows x64, set PYTHONPATH to python/x64.