Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13118/src/testing
Modified Files:
Mtest.py.in
Log Message:
add option --mserver_set which will pass its option to the Mserver or mserver5
with --set=$option
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- Mtest.py.in 30 Jan 2008 08:55:42 -0000 1.336
+++ Mtest.py.in 30 Jan 2008 19:40:44 -0000 1.337
@@ -2881,6 +2881,8 @@
('at', None, 'use_at', None, 'Use at command as watchdog'),
('dbg', None, 'dbg', '<debugger/valgrind>',
"debugger to start before each server"),
+ ('mserver_set', None, 'mserver_set', '<Mserver_option>',
+ "This passes a single set to the server"),
]
if THISFILE == 'Mtest.py':
@@ -3002,6 +3004,11 @@
a = opts.get('dbg')
if a is not None:
env['DBG'] = a
+ a = opts.get('mserver_set')
+ if a is not None:
+ env['MSERVER_SET'] = "--set " + a
+ else:
+ env['MSERVER_SET'] = ""
if THISFILE == 'Mapprove.py':
a = opts.get('ext')
if a is None:
@@ -3262,11 +3269,11 @@
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout -timeout
%d ' % par['TIMEOUT']
if par['M5']:
- exe['Mserver'] = CheckExec('mserver5') , '%s mserver5
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=true --set xrpc_open=true
--set mapi_port=%s --set xrpc_port=%s --set monet_prompt= --trace' % \
- (env['setDBG'],
config, env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'], env['XRPCPORT'])
+ exe['Mserver'] = CheckExec('mserver5') , '%s mserver5
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=true --set xrpc_open=true
--set mapi_port=%s --set xrpc_port=%s --set monet_prompt= --trace %s' % \
+ (env['setDBG'],
config, env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'],
env['XRPCPORT'], env['MSERVER_SET'])
else:
- exe['Mserver'] = CheckExec('Mserver') , '%s Mserver
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=true --set xrpc_open=true
--set mapi_port=%s --set xrpc_port=%s --set monet_prompt= --trace' % \
- (env['setDBG'],
config, env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'], env['XRPCPORT'])
+ exe['Mserver'] = CheckExec('Mserver') , '%s Mserver
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=true --set xrpc_open=true
--set mapi_port=%s --set xrpc_port=%s --set monet_prompt= --trace %s' % \
+ (env['setDBG'],
config, env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'],
env['XRPCPORT'], env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
exe['MIL_Client'] = CheckExec(env['MILCLIENT'].split(None, 1)[0])
, '%s -umonetdb -Pmonetdb --host=%s --port=%s' % (env['MILCLIENT'], HOST,
env['MAPIPORT'])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
