summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-01-31 18:49:34 +0000
committerBernard Normier <bernard@zeroc.com>2007-01-31 18:49:34 +0000
commit0f76db6b442a9c7985adbe5b8a3f06469ccbe9b3 (patch)
treea04395675afff4f27841ab86f668117d7a9f7904 /cpp/config/TestUtil.py
parentFixed bug 1720 (diff)
downloadice-0f76db6b442a9c7985adbe5b8a3f06469ccbe9b3.tar.bz2
ice-0f76db6b442a9c7985adbe5b8a3f06469ccbe9b3.tar.xz
ice-0f76db6b442a9c7985adbe5b8a3f06469ccbe9b3.zip
Beta versioning
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 42ecfeafe2c..4196c013721 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -84,7 +84,14 @@ def getIceSoVersion():
intVersion = int(re.search("ICE_INT_VERSION ([0-9]*)", config.read()).group(1))
majorVersion = intVersion / 10000
minorVersion = intVersion / 100 - 100 * majorVersion
- return '%d' % (majorVersion * 10 + minorVersion)
+ patchVersion = intVersion % 100
+ if patchVersion > 50:
+ if patchVersion >= 52:
+ return '%db%d' % (majorVersion * 10 + minorVersion, patchVersion - 50)
+ else:
+ return '%db' % (majorVersion * 10 + minorVersion)
+ else:
+ return '%d' % (majorVersion * 10 + minorVersion)
def isCygwin():