Changeset: 780e265298f6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=780e265298f6 Modified Files: testing/README Branch: Aug2011 Log Message:
Removed references to MonetDB4, Mserver, XQuery. I'm not sure I did it correctly in all cases, but this file has to be reviewed anyway. diffs (192 lines): diff --git a/testing/README b/testing/README --- a/testing/README +++ b/testing/README @@ -39,33 +39,26 @@ http://monetdb.cwi.nl/Development/TestWe and scripts must be ".(bat|cmd)" (TST.(bat|cmd)) (~,^) * a Python script (TST.py) (~,^) * a MAL script to be executed by mserver5 (TST.mal) (',^,`) - * a MIL script to be executed by Mserver (TST.milS) (',^,`) - * a MIL script to be executed by mclient -lmil (TST.milC) (",^,`) * a MAL script to be executed by mclient -lmal (TST.malC) (",^,`) * a SQL script to be executed by mclient -lsql (TST.sql) (",^,`) - * a XQUERY script to be executed by mclient -lxquery (TST.xq) (",^,`) (~) In case the name of an arbitrary executable or Python script is - suffixed with ".MIL" (i.e., TST.MIL[.(sh|exe|com|bat|cmd|py)]), - Mtest.py starts an Mserver with a MIL-listerner on MAPIPORT + suffixed with ".MAL" (i.e., TST.MAL[.(sh|exe|com|bat|cmd|py)]), + Mtest.py starts an mserver5 with a MAL-listerner on MAPIPORT in the background before executing the test. The test can then - connect via MAPI (on MAPIPORT) to that Mserver. + connect via MAPI (on MAPIPORT) to that mserver5. Similar, - with suffix ".MAL", an mserver5 with a MAL-listener on + with suffix ".SQL", an mserver5 with an SQL-listener on MAPIPORT is started; - with suffix ".SQL", an Mserver/mserver5 with an SQL-listener on - MAPIPORT is started; - with suffix ".XQUERY", an Mserver with an XQUERY-listener on - MAPIPORT is started. - In both cases, Mtest.py stops the Mserver again, once the test has + In both cases, Mtest.py stops the mserver5 again, once the test has finished. - (') For Mserver/mserver5, if several files are present named - TST_sXX.(milS|mal) (XX={00,01,...,99}) - these are executed by subsequently calling Mserver/mserver5 + (') For mserver5, if several files are present named + TST_sXX.mal (XX={00,01,...,99}) + these are executed by subsequently calling mserver5 (") For mclient, if several files are present named - (1) TST_sXX.(milC|malC|sql|xq) (XX={00,01,...,99}) - these are executed subsequently using the same Mserver/mserver5 - (2) TST_pXX.(milC|malC|sql|xq) (XX={00,01,...,99}) - these are executed concurrently using the same Mserver/mserver5 + (1) TST_sXX.(malC|sql) (XX={00,01,...,99}) + these are executed subsequently using the same mserver5 + (2) TST_pXX.(malC|sql) (XX={00,01,...,99}) + these are executed concurrently using the same mserver5 (^) For each test file TST[.*] involved, if a file called TST[.*].src exists instead of TST[.*], @@ -76,37 +69,21 @@ http://monetdb.cwi.nl/Development/TestWe TST.*.in exists instead of TST.*, all environment variables in TST.*.in are replaced by their current value when copying $TSTSRCDIR/TST.*.in to $TSTTRGDIR/TST.* . - + a MIL script to be used as prelude for Mserver - (optional) (TST.prelude) (^,`) + a MAL script to be used as prelude for mserver5 (optional) (TST.prelude5) (^,`) - + for frontend tests with MonetDB4 (Mserver), a MIL script to be executed - by the server before stating the frontend - (optional) (TST.dbinit) (^,`) + for frontend tests with MonetDB5 (mserver5), a MAL script to be executed by the server before stating the frontend (optional) (TST.dbinit5) (^,`) - + for mclient tests, a MIL script to be used as - prologue for Mserver, i.e., a script that is executed by Mserver after - dbinit is executed, but before (the first) mclient connects to Mserver - (optional) (TST.prologue) (^,`) + for mclient tests, a MAL script to be used as prologue for mserver5, i.e., a script that is executed by mserver5 after dbinit is executed, but before (the first) mclient connects to mserver5 (optional) (TST.prologue5)(^,`) - + for mclient tests, a MIL script to be used as - epilogue for Mserver, i.e., a script that is executed by Mserver after - (all) mclient(s) have finished - (optional) (TST.epilogue) (^,`) + for mclient tests, a MAL script to be used as epilogue for mserver5, i.e., a script that is executed by mserver5 after (all) mclient(s) have finished (optional) (TST.epilogue5)(^,`) + a file that contains a list of modules (one per line) required by the test (optional) (TST.modules) (^,`) - + a file that contains a list of BATs (one per line) - (created by previous tests within the same directory) - required by the test (optional; MonetDB4, only) (TST.BATs) (^,`) + a file that contains a list of tests (one per line) that must have run successfully prior to the test (optional) (TST.reqtests) + a set of files used by the arbitrary executable @@ -126,28 +103,15 @@ http://monetdb.cwi.nl/Development/TestWe one of the following: * TST[.sh|.exe|.com|.bat|.cmd] TST [TST.prelude] * python TST.py [TST.prelude] - * Mserver --dbname=TSTDB [TST.prelude] < TST.milS * mserver5 --dbname=TSTDB [TST.prelude] < TST.mal - * Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit] module(mapi); mil_start();" [TST.prologue] & - mclient -lmil < TST[_(s|p)XX].milC - or TST.MIL.(sh|exe|com|bat|cmd) TST [TST.prelude] - or python TST.MIL.py [TST.prelude] * mserver5 --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit5]" [TST.prologue5] & mclient -lmal < TST[_(s|p)XX].malC or TST.MAL.(sh|exe|com|bat|cmd) TST or python TST.MAL.py - * Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit] module(sql_server);" [TST.prologue] & - mclient -lsql < TST[_(s|p)XX].sql - or TST.SQL.(sh|exe|com|bat|cmd) TST - or python TST.SQL.py * mserver5 --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit5]" [TST.prologue5] & mclient -lsql < TST[_(s|p)XX].sql or TST.SQL.(sh|exe|com|bat|cmd) TST or python TST..SQL.py - * Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit] module(pathfinder);" [TST.prologue] & - mclient -lxquery -fxml < TST[_(s|p)XX].xq - or TST.XQUERY.(sh|exe|com|bat|cmd) TST - or python TST.XQUERY.py (On Unix, all M<tool>'s are started with "Mtimeout -timeout TIMEOUT M<tool> ..." to kill (probably) hanging M<tool>'s after a certain @@ -158,8 +122,8 @@ http://monetdb.cwi.nl/Development/TestWe Additionally, MkillUsers is scheduled as at-job to kill orphaned processes that Mtimeout cannot reach any more.) - (Mserver is called with "--config=$MONETDB_CONF --debug=$GDK_DEBUG $setMONETDB_MOD_PATH --set monet_prompt=". - See below and "Mserver --help" for details.) + (mserver5 is called with "--debug=$GDK_DEBUG $setMONETDB_MOD_PATH --set monet_prompt=". + See below and "mserver5 --help" for details.) (mclient is called with "--port=$MAPIPORT". See "mclient --help" for details.) @@ -218,21 +182,18 @@ http://monetdb.cwi.nl/Development/TestWe ---- ------- ----------- TSTSRCBASE `<PACKAGE>-config --source` base of test source tree TSTTRGBASE `<PACKAGE>-config --prefix` base for test output - MILCLIENT mclient -lmil mil-client program `) MALCLIENT mclient -lmal mal-client program `) SQLCLIENT mclient -lsql sql-client program `) SQLDUMP msqldump sql-dump program `) - XQUERYCLIENT mclient -lxquery -fxml xquery-client program `) - PF pf (or pf -M if using MPS) xquery stand-alone compiler - `) Alternative MIL-, MAL-, SQL-, & XQUERY- client programs need to accept (or ignore) + `) Alternative MAL & SQL client programs need to accept (or ignore) "--config=", "--host=", & "--port=" options. The following variables are currently still used legacy, but they will disappear soon... MONETDB_MOD_PATH `<PACKAGE>-config --modpath([45])` - The setting of all these environment variables maybe overruled - by commandline options with the same names, e.g., "--MILCLIENT=mclient.py". + The setting of all these environment variables may be overruled + by commandline options with the same names, e.g., "--MALCLIENT=mclient.py". NOTE: All paths must be given as ABSOLUTE PHYSICAL PATHS (see "IMPORTANT NOTE" @@ -247,23 +208,19 @@ http://monetdb.cwi.nl/Development/TestWe SYSTVER `uname``uname -r` MTIMEOUT "Mtimeout -timeout $TIMEOUT" MDIFF "$MTIMEOUT Mdiff" - MSERVER "$MTIMEOUT Mserver --config=$MONETDB_CONF --debug=$GDK_DEBUG $setMONETDB_MOD_PATH $setGDK_DBFARM --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --set monet_prompt= --trace" - MIL_CLIENT "$MTIMEOUT $MILCLIENT --config=$MONETDB_CONF --host=$HOST --port=$MAPIPORT" + MSERVER "$MTIMEOUT mserver5 --config=$MONETDB_CONF --debug=$GDK_DEBUG $setMONETDB_MOD_PATH $setGDK_DBFARM --set mapi_port=$MAPIPORT --set monet_prompt= --trace" 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" - XQUERY_CLIENT "$MTIMEOUT $XQUERYCLIENT -u monetdb -P monetdb --host=$HOST --port=$MAPIPORT" MAPIPORT the MAPI port (random number between 30000 and 39999) - XRPCPORT the XRPC port (random number between 40000 and 49999) TST name of the current test TSTDB name of default test database, unique for each directory TSTDIR current test directory without $TSTSRCBASE/ & /Tests TSTSRCDIR $TSTSRCBASE/$TSTDIR/Tests TSTTRGDIR $TSTTRGBASE/mTests/$TSTDIR - MONETDB_CONF location of MonetDB.conf (default: `monetdb4-config --sysconfdir`/MonetDB.conf) GDK_DBFARM as read from $MONETDB_CONF or set by --dbfarm=<path> - GDK_DEBUG debug bitmask for Mserver (default: 10) - MONETDB_MOD_PATH new module search path of Mserver (if set via --monet_mod_path=<pathlist>) + GDK_DEBUG debug bitmask for mserver5 (default: 10) + MONETDB_MOD_PATH new module search path of mserver5 (if set via --monet_mod_path=<pathlist>) setMONETDB_MOD_PATH "--set monet_mod_path=$MONETDB_MOD_PATH" (if --monet_mod_path=<pathlist> is used) setGDK_DBFARM "--set gdk_dbfarm=$GDK_DBFARM" (if --dbfarm=<path> is used) @@ -301,8 +258,10 @@ http://monetdb.cwi.nl/Development/TestWe "#~EndVariableOutput~#", respectively, with "#~". These lines are then ignored during Mdiff. - MIL Example: - printf("#~BeginVariableOutput~#\n"); cpu.print(); printf("#~EndVariableOutput~#\n); + MAL Example: + io.printf("#~BeginVariableOutput~#\n"); + io.print(somebat); + io.printf("#~EndVariableOutput~#\n); - A tool Mapprove.py is provided to copy the recent output from _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
