summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-05-31 17:15:52 -0400
committerBernard Normier <bernard@zeroc.com>2016-05-31 17:15:52 -0400
commit33cf3dc133368a86b9523b4806aafe54f26e9faa (patch)
tree68a05d3d594b783d2c37644f821317c39fffadfc /scripts/TestUtil.py
parentFixed version computation (diff)
downloadice-33cf3dc133368a86b9523b4806aafe54f26e9faa.tar.bz2
ice-33cf3dc133368a86b9523b4806aafe54f26e9faa.tar.xz
ice-33cf3dc133368a86b9523b4806aafe54f26e9faa.zip
Fix for version computation
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index ea2fcbe0e82..62b0c264474 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -213,12 +213,12 @@ def getIceSoVersion():
majorVersion = int(intVersion / 10000)
minorVersion = int(intVersion / 100) - 100 * majorVersion
patchVersion = intVersion % 100
- if patchVersion <= 50:
+ if patchVersion < 50:
return '%d' % (majorVersion * 10 + minorVersion)
- elif patchVersion <= 70:
- return '%da%d' % (majorVersion * 10 + minorVersion, patchVersion - 51)
+ elif patchVersion < 60:
+ return '%da%d' % (majorVersion * 10 + minorVersion, patchVersion - 50)
else:
- return '%db%d' % (majorVersion * 10 + minorVersion, patchVersion - 71)
+ return '%db%d' % (majorVersion * 10 + minorVersion, patchVersion - 60)
def getIceJsonVersion():
r = re.search(r"([0-9]+)\.([0-9]+)(\.[0-9]+|[ab][0-9]+)", iceVersion)