Changeset: 3719df8a3963 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3719df8a3963
Modified Files:
testing/Mtest.py.in
testing/Mz.py.in
Branch: Jul2021
Log Message:
Simplify.
diffs (96 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -59,7 +59,7 @@ isatty = os.isatty(sys.stdout.fileno())
mapiportre = re.compile(r'mapi:monetdb://[-.a-zA-Z0-9]+:(?P<port>\d+)/')
-geos_version = '@GEOS_VERSION@'
+geos_version = '@GEOS_VERSION@'.split('.')
# default is no color (these three functions may get redefined)
def prred(str, write = sys.stdout.write):
@@ -2029,29 +2029,28 @@ def RunTest(env, TST, COND, oktests, len
break
passwd = cond[7:]
elif cond.startswith('GEOS_VERSION>='):
- if not geos_version:
+ if not geos_version or not geos_version[0]:
reason = "no geos version information available"
elem = SkipTest(env, TST, EXT, reason, length)
break
req_vers = cond[14:].split('.')
- act_vers = geos_version.split('.')
if not negate:
- for i in range(len(act_vers)):
+ for i in range(len(geos_version)):
if i >= len(req_vers):
break
- if int(act_vers[i]) > int(req_vers[i]):
+ if int(geos_version[i]) > int(req_vers[i]):
break
- if int(act_vers[i]) < int(req_vers[i]):
+ if int(geos_version[i]) < int(req_vers[i]):
reason = "geos version too low"
elem = SkipTest(env, TST, EXT, reason, length)
break
else:
- for i in range(len(act_vers)):
+ for i in range(len(geos_version)):
if i >= len(req_vers):
break
- if int(act_vers[i]) < int(req_vers[i]):
+ if int(geos_version[i]) < int(req_vers[i]):
break
- if int(act_vers[i]) > int(req_vers[i]):
+ if int(geos_version[i]) > int(req_vers[i]):
reason = "geos version too high"
elem = SkipTest(env, TST, EXT, reason, length)
break
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -57,7 +57,7 @@ isatty = os.isatty(sys.stdout.fileno())
mapiportre = re.compile(r'mapi:monetdb://[-.a-zA-Z0-9]+:(?P<port>\d+)/')
-geos_version = '@GEOS_VERSION@'
+geos_version = '@GEOS_VERSION@'.split('.')
# default is no color (these three functions may get redefined)
def prred(str, write = sys.stdout.write):
@@ -1109,27 +1109,26 @@ def RunTest(env, test, oktests, pSrvr):
break
passwd = cond[7:]
elif cond.startswith('GEOS_VERSION>='):
- if not geos_version:
+ if not geos_version or not geos_version[0]:
reason = "no geos version information available"
break
req_vers = cond[14:].split('.')
- act_vers = geos_version.split('.')
if not negate:
- for i in range(len(act_vers)):
+ for i in range(len(geos_version)):
if i >= len(req_vers):
break
- if int(act_vers[i]) > int(req_vers[i]):
+ if int(geos_version[i]) > int(req_vers[i]):
break
- if int(act_vers[i]) < int(req_vers[i]):
+ if int(geos_version[i]) < int(req_vers[i]):
reason = "geos version too low"
break
else:
- for i in range(len(act_vers)):
+ for i in range(len(geos_version)):
if i >= len(req_vers):
break
- if int(act_vers[i]) < int(req_vers[i]):
+ if int(geos_version[i]) < int(req_vers[i]):
break
- if int(act_vers[i]) > int(req_vers[i]):
+ if int(geos_version[i]) > int(req_vers[i]):
reason = "geos version too high"
break
if reason is not None:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
