Changeset: 80f248ae65a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80f248ae65a8
Modified Files:
testing/Mtest.py.in
Branch: Jan2014
Log Message:
Implemented --nomito flag to start server without --forcemito flag.
diffs (31 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3441,6 +3441,8 @@ def main(argv) :
('testweb', None, 'testweb', None, 'Optimize testing for testweb'),
('releaserun', None, 'releaserun', None,
'run tests as if for a release test'),
+ ('nomito', None, 'nomito', None,
+ 'Do not pass --forcemito to server'),
]
if THISFILE == 'Mtest.py':
@@ -3509,6 +3511,7 @@ def main(argv) :
procdebug = opts.get('procdebug', False)
global releaserun
releaserun = opts.get('releaserun', releaserun)
+ nomito = opts.get('nomito', False)
CONDITIONALS['RELEASERUN'] = releaserun
if THISFILE == "Mtest.py":
_IGNORE = dftIGNORE
@@ -3790,8 +3793,8 @@ def main(argv) :
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout
-timeout %d ' % par['TIMEOUT']
- exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s --set monet_prompt= --forcemito --set mal_listing=2 %s' % \
-
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, env['MSERVER_SET'])
+ exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s --set monet_prompt= %s --set mal_listing=2 %s' % \
+
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, not nomito and '--forcemito'
or '', env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
exe['MAL_Client'] = CheckExec(env['MALCLIENT'].split(None,
1)[0]) , '%s -i -e --host=%s --port=%s' % (env['MALCLIENT'], HOST,
env['MAPIPORT'])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
