Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18289
Modified Files:
Mtest.py.in
Log Message:
when testing sql, geom and/or pathfinder,
bail-out immediately in case the respective module cannot be loaded
successfully.
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- Mtest.py.in 31 Oct 2007 10:51:12 -0000 1.319
+++ Mtest.py.in 2 Nov 2007 07:31:36 -0000 1.320
@@ -3391,6 +3391,14 @@
MissingMods = CheckMods(env, '', 'SQL', '')
if MissingMods:
ErrXit('Stopping SQL testing as modules "%s" are missing!' %
str(MissingMods))
+ if par['M5']:
+ mod_name = 'sql'
+ mod_load = 'include %s;' % mod_name
+ else:
+ mod_name = 'sql_server'
+ mod_load = 'module(%s);' % mod_name
+ if Check('%s --dbname=%s "--dbinit=%s"' %
(env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT):
+ ErrXit('Stopping SQL testing as module "%s" fails to load!' %
mod_name)
is_pf = par['PACKAGE'] == 'monetdb-xquery'
if not is_pf:
@@ -3408,6 +3416,13 @@
MissingMods = CheckMods(env, '', 'XQUERY', '')
if MissingMods:
ErrXit('Stopping Pathfinder testing as modules "%s" are
missing!' % str(MissingMods))
+ mod_name = 'pathfinder'
+ if par['M5']:
+ mod_load = 'include %s;' % mod_name
+ else:
+ mod_load = 'module(%s);' % mod_name
+ if Check('%s --dbname=%s "--dbinit=%s"' %
(env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT):
+ ErrXit('Stopping Pathfinder testing as module "%s" fails to
load!' % mod_name)
if par['PACKAGE'] == 'monetdb-geom':
MissingMods = CheckMods(env, '', 'SQL', '')
@@ -3415,6 +3430,13 @@
MissingMods.append('geom')
if MissingMods:
ErrXit('Stopping Geom testing as modules "%s" are missing!' %
str(MissingMods))
+ mod_name = 'geom'
+ if par['M5']:
+ mod_load = 'include %s;' % mod_name
+ else:
+ mod_load = 'module(%s);' % mod_name
+ if Check('%s --dbname=%s "--dbinit=%s"' %
(env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT):
+ ErrXit('Stopping Geom testing as module "%s" fails to load!' %
mod_name)
if par['PACKAGE'] == 'monetdb-amdb':
if not env['exe']['X100_Client'][0]:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
