summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-07-06 17:10:19 +0200
committerJose <jose@zeroc.com>2016-07-06 17:10:19 +0200
commit4ab1c41cb7b476cb5a93363cd19f88427412d0ab (patch)
tree1c8cd1bf593efbbb2fed0053f0c3b15e56bba449 /scripts/TestUtil.py
parentAdded fix to wait for current to be 0 on the invocation observer (diff)
downloadice-4ab1c41cb7b476cb5a93363cd19f88427412d0ab.tar.bz2
ice-4ab1c41cb7b476cb5a93363cd19f88427412d0ab.tar.xz
ice-4ab1c41cb7b476cb5a93363cd19f88427412d0ab.zip
Fix Ice Version detection in Windows
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 75055a80eda..2e561e207c5 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -410,7 +410,7 @@ else:
iceVersion = None
try:
if isWin32():
- config = open(os.path.join(toplevel, "config", "Ice.props"), "r")
+ config = open(os.path.join(toplevel, "config", "icebuilder.props"), "r")
iceVersion = re.search("<IceVersion>[\t\s]*([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))</IceVersion>", config.read()).group(1)
else:
config = open(os.path.join(toplevel, "config", "Make.rules"), "r")