Changeset: 003d82085cc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=003d82085cc3
Modified Files:
monetdb5/mal/Tests/run
testing/Mtest.py.in
testing/README
testing/process.py
tools/mserver/mserver5.c
Branch: Feb2013
Log Message:
mserver5: --trace option has never been implemented; hence, we remove it
diffs (87 lines):
diff --git a/monetdb5/mal/Tests/run b/monetdb5/mal/Tests/run
--- a/monetdb5/mal/Tests/run
+++ b/monetdb5/mal/Tests/run
@@ -3,8 +3,8 @@
#DBFARM=$PWD/dbfarm
DBFARM=/ufs/mk/monet5/Linux/var/MonetDB/dbfarm
DBNAME=test
-#MSERVER="Mtimeout -timeout 123 mserver --dbfarm=$DBFARM --dbname=$DBNAME -c
All.conf --set monet_prompt= --trace"
-MSERVER="valgrind --leak-check=full --show-reachable=yes --num-callers=20
mserver5 --dbfarm=$DBFARM --dbname=$DBNAME --set monet_prompt= --trace"
+#MSERVER="Mtimeout -timeout 123 mserver --dbfarm=$DBFARM --dbname=$DBNAME -c
All.conf --set monet_prompt="
+MSERVER="valgrind --leak-check=full --show-reachable=yes --num-callers=20
mserver5 --dbfarm=$DBFARM --dbname=$DBNAME --set monet_prompt="
echo "Initialize database"
rm -rf $DBFARM/$DBNAME
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3641,7 +3641,7 @@ def main(argv) :
if THISFILE == "Mtest.py":
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
--set monet_prompt= --trace --forcemito --set mal_listing=2 %s' % \
+ exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%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'], env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
diff --git a/testing/README b/testing/README
--- a/testing/README
+++ b/testing/README
@@ -208,10 +208,10 @@ http://monetdb.cwi.nl/Development/TestWe
SYSTVER `uname``uname -r`
MTIMEOUT "Mtimeout -timeout $TIMEOUT"
MDIFF "$MTIMEOUT Mdiff"
- MSERVER "$MTIMEOUT mserver5 --config=$MONETDB_CONF
--debug=$GDK_DEBUG $setMONETDB_MOD_PATH $setGDK_DBFARM --set
mapi_port=$MAPIPORT --set monet_prompt= --trace"
+ MSERVER "$MTIMEOUT mserver5 --config=$MONETDB_CONF
--debug=$GDK_DEBUG $setMONETDB_MOD_PATH $setGDK_DBFARM --set
mapi_port=$MAPIPORT --set monet_prompt="
MAL_CLIENT "$MTIMEOUT $MALCLIENT --config=$MONETDB_CONF
--host=$HOST --port=$MAPIPORT"
- SQL_CLIENT "$MTIMEOUT $SQLCLIENT -u monetdb -P monetdb
--host=$HOST --port=$MAPIPORT --trace"
- SQL_DUMP "$MTIMEOUT $SQLDUMP -u monetdb -P monetdb --host=$HOST
--port=$MAPIPORT --trace"
+ SQL_CLIENT "$MTIMEOUT $SQLCLIENT -u monetdb -P monetdb
--host=$HOST --port=$MAPIPORT"
+ SQL_DUMP "$MTIMEOUT $SQLDUMP -u monetdb -P monetdb --host=$HOST
--port=$MAPIPORT"
MAPIPORT the MAPI port (random number between 30000 and 39999)
TST name of the current test
TSTDB name of default test database, unique for each directory
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -320,8 +320,7 @@ def server(args = [], stdin = None, stdo
cmd = ['mserver5',
'--set', 'mapi_open=true',
'--set', 'gdk_nr_threads=1',
- '--set', 'monet_prompt=',
- '--trace']
+ '--set', 'monet_prompt=']
if notrace and '--trace' in cmd:
cmd.remove('--trace')
if dbinit is not None:
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -225,7 +225,6 @@ main(int argc, char **av)
{ "readonly", 0, 0, 'r' },
{ "single-user", 0, 0, 0 },
{ "set", 1, 0, 's' },
- { "trace", 0, 0, 't' },
{ "threads", 0, 0, 0 },
{ "memory", 0, 0, 0 },
{ "properties", 0, 0, 0 },
@@ -284,7 +283,7 @@ main(int argc, char **av)
for (;;) {
int option_index = 0;
- int c = getopt_long(argc, av, "c:d::trs:h?",
+ int c = getopt_long(argc, av, "c:d::rs:h?",
long_options, &option_index);
if (c == -1)
@@ -395,10 +394,6 @@ main(int argc, char **av)
}
}
break;
- case 't': /* trace option, ignored to reduce testweb
complaints
- fprintf(stderr, "#warning: trace option not
yet supported\n");
- */
- break;
case 'h':
case '?':
/* a bit of a hack: look at the option that the
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
