summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index ad7533add6d..982c3221521 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -390,8 +390,12 @@ else:
#
iceVersion = None
try:
- config = open(os.path.join(toplevel, "config", "Make.rules"), "r")
- iceVersion = re.search("version[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))", config.read()).group(1)
+ if isWin32():
+ config = open(os.path.join(toplevel, "config", "Ice.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")
+ iceVersion = re.search("version[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))", config.read()).group(1)
config.close()
except:
print("error: couldn't figure Ice version")