Changeset: 21e85f0d6944 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21e85f0d6944
Modified Files:
testing/Mtest.py.in
Branch: Nov2019
Log Message:
Merge with Apr2019 branch.
diffs (43 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3349,8 +3349,8 @@ def CheckClassPath() :
cp = ''
cpx = ''
JARS = {
- 'HAVE_MONETDBJDBC_JAR' :
re.compile('^monetdb-jdbc-[0-9]\.[0-9]+(-[a-f0-9]{12})?\.jar$'),
- 'HAVE_JDBCCLIENT_JAR' : re.compile('^jdbcclient\.jar$'),
+ 'HAVE_MONETDBJDBC_JAR' :
re.compile('^monetdb-jdbc-[0-9]\.[0-9]+(-[a-f0-9]{12})?\.jre[0-9]+\.jar$'),
+ 'HAVE_JDBCCLIENT_JAR' : re.compile('^jdbcclient\.jre[0-9]+\.jar$'),
'HAVE_JDBCTESTS_JAR' : re.compile('^jdbctests\.jar$'),
}
# check for known JARs in CLASSPATH files
@@ -3359,19 +3359,17 @@ def CheckClassPath() :
for f in os.listdir(p):
if not f.endswith('.jar'):
continue
- C = 'HAVE_%s' % f.upper().replace('.','_')
- if C not in JARS:
- C = 'HAVE_MONETDBJDBC_JAR'
+ for C in JARS:
+ if JARS[C].match(f):
+ CONDITIONALS[C] = '#'
+ cp = os.path.join(p, f) + os.pathsep + cp
+ break
+ elif os.path.isfile(p):
+ f = os.path.basename(p)
+ for C in JARS:
if JARS[C].match(f):
CONDITIONALS[C] = '#'
- cp = os.path.join(p, f) + os.pathsep + cp
- elif os.path.isfile(p):
- f = os.path.basename(p)
- C = 'HAVE_%s' % f.upper().replace('.','_')
- if C not in JARS:
- C = 'HAVE_MONETDBJDBC_JAR'
- if JARS[C].match(f):
- CONDITIONALS[C] = '#'
+ break
# check for known JARs in CLASSPATH directories
# + fall-back using pkgdatadir/lib
cpx += _configure(os.path.join('@QXdatadir@','monetdb','lib'))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
