Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1515/MonetDB/src/testing
Modified Files:
MkillUsers.in Mtest.py.in README
Log Message:
There has been the desire to rename "MapiClient" into "mclient"
and this "tiny" checkin serves to implment (most of) this desire;
I did not change any Windows installer files and/or MapiClient-related
.bat (batch-) scripts.
Details:
Martin already added "mclient" as clone of "MapiClient" in clients,
and Sjoerd fixed the RPM .spec files for packaging accordingly.
(Windows installer files will most probably follow soon.)
To ensure a "smooth" transition, the idea is to provide both
"MapiClient" and "mclient" with the upcoming feature release of clients.
This allows backward compatibility with the currently released "Stable"
versions of the remaining MonetDB packages.
This checking makes sure that the development versions of all remaining
MonetDB packages move from using "MapiClient" to using "mclient",
requiring the latest development version of clients, that will soon be
released as new feature release "MonetDB-Clients 1.20.0".
Once also the current development versions of the remainig MonetDB pakages
(now using "mclient" instead of "MapiClient") have been released,
"MapiClient" can/will be removed from clients.
For convenient reference, these changes are wrapped in tags
"MapiClient_2_mclient-before" & "MapiClient_2_mclient-after".
Please note:
Like various "MapiClient"/"mclient"-related (and other) changes in
monetwed/ before, these changes reflect the situation of the to-be
release new feature release of clients (MonetDB-Clients);
hence, these changes should not go life, before the respective
release has been finished.
Index: README
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/README,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- README 20 Feb 2007 10:33:39 -0000 1.35
+++ README 22 Aug 2007 06:21:57 -0000 1.36
@@ -39,9 +39,9 @@
* a MIL script to be executed by Mserver -single (TST.milS) (',^,`)
(-single has been removed, so .milM & .milS are
treated equally, now)
- * a MIL script to be executed by MapiClient -lmil (TST.milC) (",^,`)
- * a SQL script to be executed by MapiClient -lsql (TST.sql) (",^,`)
- * a XQUERY script to be executed by MapiClient -lxquery (TST.xq) (",^,`)
+ * a MIL script to be executed by mclient -lmil (TST.milC) (",^,`)
+ * 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 ".MAPI" (i.e., TST.MAPI[.(exe|com|bat|cmd|py)]),
Mtest.py starts an Mserver with a MAPI-listerner on MAPIPORT
@@ -56,7 +56,7 @@
(') For Mserver, if several files are present named
TST_sXX.mil(M|S) (XX={00,01,...,99})
these are executed by subsequently calling Mserver
- (") For MapiClient, if several files are present named
+ (") For mclient, if several files are present named
(1) TST_sXX.(milC|sql|xq) (XX={00,01,...,99})
these are executed subsequently using the same Mserver
(2) TST_pXX.(milC|sql|xq) (XX={00,01,...,99})
@@ -82,23 +82,23 @@
+ for frontend tests, a MIL script to be used
instead of the frontends dbinit script.
(optional) (TST.dbinit) (^,`)
- + for MapiClient tests, a MIL script to be used as
+ + 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)
- MapiClient connects to Mserver
+ mclient connects to Mserver
(optional) (TST.prologue)
(^,`)
+ for SQL tests, a MAL script to be used as
prologue for mserver5, i.e., a script that is executed by mserver5 after
- "include sql;" is called and before (the first) SQL-MapiClient connects
+ "include sql;" is called and before (the first) SQL-mclient connects
to mserver5
(optional)
(TST.prologue5)(^,`)
- + for MapiClient tests, a MIL script to be used as
+ + for mclient tests, a MIL script to be used as
epilogue for Mserver, i.e., a script that is executed by Mserver after
- (all) MapiClient(s) have finished
+ (all) mclient(s) have finished
(optional) (TST.epilogue)
(^,`)
- + for MapiClient tests, a MAL script to be used as
+ + for mclient tests, a MAL script to be used as
epilogue for mserver5, i.e., a script that is executed by mserver5 after
- (all) MapiClient(s) have finished
+ (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)
(^,`)
@@ -124,15 +124,15 @@
* python TST.py [TST.prelude]
* Mserver --dbname=TSTDB [TST.prelude] < TST.mil(M|S)
* Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT
--dbinit="module(mapi); mil_start();" [TST.prologue] &
- MapiClient -lmil < TST[_(s|p)XX].milC
+ mclient -lmil < TST[_(s|p)XX].milC
or TST[.exe|.com|.bat|.cmd] TST [TST.prelude]
or python TST.py [TST.prelude]
* Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT
--dbinit="module(sql_server);" [TST.prologue] &
- MapiClient -lsql < TST[_(s|p)XX].sql
+ mclient -lsql < TST[_(s|p)XX].sql
or TST[.exe|.com|.bat|.cmd] TST [TST.prelude]
or python TST.py [TST.prelude]
* Mserver --dbname=TSTDB --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT
--dbinit="module(pathfinder);" [TST.prologue] &
- MapiClient -lxquery -oxml < TST[_(s|p)XX].xq
+ mclient -lxquery -oxml < TST[_(s|p)XX].xq
or TST[.exe|.com|.bat|.cmd] TST [TST.prelude]
or python TST.py [TST.prelude]
@@ -148,8 +148,8 @@
(Mserver is called with "--config=$MONETDB_CONF --debug=$GDK_DEBUG
$setMONETDB_MOD_PATH --set monet_prompt=".
See below and "Mserver --help" for details.)
- (MapiClient is called with "--port=$MAPIPORT".
- See "MapiClient --help" for details.)
+ (mclient is called with "--port=$MAPIPORT".
+ See "mclient --help" for details.)
- Mtest.py uses three directory trees based at TSTSRCBASE, TSTBLDBASE, and
@@ -227,10 +227,10 @@
TSTSRCBASE $MONETDB_SOURCE base of test
source tree
TSTBLDBASE $MONETDB_BUILD base of
extracted test tree
TSTTRGBASE $MONETDB_PREFIX base for test
output
- MAPICLIENT MapiClient -lmil mapi-client
program `)
- SQLCLIENT MapiClient -lsql sql-client
program `)
+ MAPICLIENT mclient -lmil mil-client
program `)
+ SQLCLIENT mclient -lsql sql-client
program `)
SQLDUMP msqldump sql-dump
program `)
- XQUERYCLIENT MapiClient -lxquery -oxml xquery-client
program `)
+ XQUERYCLIENT mclient -lxquery -oxml xquery-client
program `)
`) Alternative Mapi-, SQL-, & XQUERY- client programs need to accept (or
ignore)
"--config=", "--host=", & "--port=" options.
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- Mtest.py.in 21 Aug 2007 12:35:57 -0000 1.288
+++ Mtest.py.in 22 Aug 2007 06:21:57 -0000 1.289
@@ -1505,7 +1505,7 @@
elem = SkipTest(env, TST, EXT, "as python is not available.")
#TODO:
#elif EXT == ".milC":
- #elem = SkipTest(env, TST, EXT, "as MapiClient-tests are temporary not
supported by "+THISFILE+".")
+ #elem = SkipTest(env, TST, EXT, "as mclient-tests are temporary not
supported by "+THISFILE+".")
#TODO:
#elif [ "$EXT" = "java" -a ! "`type -path java`" ] ; then
#elem = SkipTest(env, TST, EXT, "as java is not in $PATH.")
@@ -1514,7 +1514,7 @@
elif MissingBATs:
elem = SkipTest(env, TST, EXT, "as BATs '"+str(MissingBATs)+"` are
missing in database '"+TSTDB+"`.")
elif CALL == "milCXp":
- elem = SkipTest(env, TST, EXT, "as multiple MapiClients in parallel
are currently not supported by "+THISFILE+".")
+ elem = SkipTest(env, TST, EXT, "as multiple MIL clients in parallel
are currently not supported by "+THISFILE+".")
elif CALL == "sqlXp":
elem = SkipTest(env, TST, EXT, "as multiple SQL clients in parallel
are currently not supported by "+THISFILE+".")
elif CALL == "xqXp":
@@ -2622,10 +2622,10 @@
dft['setXQUERY_LOGDIR'] = "'--set
\"xquery_logdir='+env['XQUERY_LOGDIR']+'\"'"
dft['MAPIPORT'] = "str(randomPort(30000,39999))"
dft['XRPCPORT'] = "str(randomPort(40000,49999))"
- dft['MAPICLIENT'] = "'MapiClient -lmil'"
- dft['SQLCLIENT'] = "'MapiClient -lsql'"
+ dft['MAPICLIENT'] = "'mclient -lmil'"
+ dft['SQLCLIENT'] = "'mclient -lsql'"
dft['SQLDUMP'] = "'msqldump'"
- dft['XQUERYCLIENT'] = "'MapiClient -lxquery -oxml'"
+ dft['XQUERYCLIENT'] = "'mclient -lxquery -oxml'"
dft['X100CLIENT'] = "'x100run_mapi'"
if THISFILE == "Mprofile.py":
dft['CMDLST'] = "FindCmdLst(env)"
Index: MkillUsers.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/MkillUsers.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- MkillUsers.in 15 Aug 2007 11:05:29 -0000 1.26
+++ MkillUsers.in 22 Aug 2007 06:21:57 -0000 1.27
@@ -93,7 +93,7 @@
if [ "$TEMPLATE_BUILD" ] ; then BINPATH="$BINPATH
$TEMPLATE_BUILD/src/tools $TEMPLATE_BUILD/src/tools/.libs" ; fi
if [ "$PATHFINDER_BUILD" ] ; then BINPATH="$BINPATH
$PATHFINDER_BUILD/src/tools $PATHFINDER_BUILD/src/tools/.libs" ; fi
for b in $BINPATH ; do
- files="$files `ls $b/* 2>/dev/null | egrep
'/(mserver5|Mserver|MapiClient|MapiClient\.py|Mdiff|Mlog|Mtimeout|pf)$'`"
+ files="$files `ls $b/* 2>/dev/null | egrep
'/(mserver5|Mserver|MapiClient|mclient|MapiClient\.py|Mdiff|Mlog|Mtimeout|pf)$'`"
done
case `uname` in
-------------------------------------------------------------------------
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
