Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16691/MonetDB/src/testing
Modified Files:
Mfilter.py.in Mtest.py.in README
Log Message:
(more) Mtest.py cleaning:
united extensions ".milM" & ".milS" into ".milS"
(they have been treated equally for a long time)
Index: README
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/README,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- README 12 Sep 2007 07:35:59 -0000 1.41
+++ README 12 Sep 2007 08:37:12 -0000 1.42
@@ -34,10 +34,7 @@
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.milM) (',^,`)
- * 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 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) (",^,`)
@@ -69,7 +66,7 @@
TST[.*].src exists instead of TST[.*],
TST[.*].src is expected to contain a single line
giving the original location of the test file to be used.
- E.g., src/modules/plain/Tests/arith.milM.src contains
+ E.g., src/modules/plain/Tests/arith.milS.src contains
$TSTBLDBASE/$TSTDIR/arith.mil
in order to use the MIL script extracted from
src/modules/plain/arith.mx as test script.
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- Mtest.py.in 12 Sep 2007 07:35:59 -0000 1.305
+++ Mtest.py.in 12 Sep 2007 08:37:11 -0000 1.306
@@ -29,7 +29,6 @@
# contains(<file>,<string>)
# - do multi-level prompting?
# - normalize all path's used
-# - remove one of milM, milS
try:
True
@@ -1404,14 +1403,10 @@
EXT = ".SQL.py" ; CALL = "python" ; SERVER = "SQL"
elif os.path.isfile(TST+".XQUERY"+".py") or
os.path.isfile(TST+".XQUERY"+".py.src") or
os.path.isfile(TST+".XQUERY"+".py.in"):
EXT = ".XQUERY.py" ; CALL = "python" ; SERVER = "XQUERY"
- elif os.path.isfile(TST+".milM") or
os.path.isfile(TST+".milM.src") or os.path.isfile(TST+".milM.in"):
- EXT = ".milM" ; CALL = "milM"
elif os.path.isfile(TST+".milS") or
os.path.isfile(TST+".milS.src") or os.path.isfile(TST+".milS.in"):
EXT = ".milS" ; CALL = "milS"
elif os.path.isfile(TST+".milC") or
os.path.isfile(TST+".milC.src") or os.path.isfile(TST+".milC.in"):
EXT = ".milC" ; CALL = "milC" ; SERVER = "MIL"
- elif os.path.isfile(TST+"_s00.milM") or
os.path.isfile(TST+"_s00.milM.src") or os.path.isfile(TST+"_s00.milM.in"):
- EXT = ".milM" ; CALL = "milMXs"
elif os.path.isfile(TST+"_s00.milS") or
os.path.isfile(TST+"_s00.milS.src") or os.path.isfile(TST+"_s00.milS.in"):
EXT = ".milS" ; CALL = "milSXs"
elif os.path.isfile(TST+"_s00.milC") or
os.path.isfile(TST+"_s00.milC.src") or os.path.isfile(TST+"_s00.milC.in"):
@@ -1455,11 +1450,11 @@
return RunTest(env, TST[:i], BusyPorts, COND)
EXT = CALL = SERVER = ""
if os.name == "nt":
- ErrMsg("test missing:
'"+os.path.join(TSTSRCDIR,TST)+".(exe|com|bat|cmd|py|mal|malC|milM|milS|milC|sql|xq|x100)`")
+ ErrMsg("test missing:
'"+os.path.join(TSTSRCDIR,TST)+".(exe|com|bat|cmd|py|mal|malC|milS|milC|sql|xq|x100)`")
#TODO:
#elif os.name == "posix":
else:
- ErrMsg("test missing:
'"+os.path.join(TSTSRCDIR,TST)+"[.py|.mal|.malC|.milM|.milS|.milC|.sql|.xq|.x100]`")
+ ErrMsg("test missing:
'"+os.path.join(TSTSRCDIR,TST)+"[.py|.mal|.malC|.milS|.milC|.sql|.xq|.x100]`")
return TX,Failed,Failed,elem
if par['PACKAGE'] not in ('monetdb', 'monetdb-clients'):
@@ -1621,13 +1616,13 @@
else:
TOx = 1
CTIMEOUT = CTIMEOUT + ( TOx * TIMEOUT )
- elif CALL in ["malXs", "milMXs", "milSXs", "milCXs", "sqlXs", "xqXs",
"x100Xs"]:
+ elif CALL in ["malXs", "milSXs", "milCXs", "sqlXs", "xqXs", "x100Xs"]:
test = re.compile("^"+TST+"_s[0-9][0-9]"+EXT+"$", re.MULTILINE)
d = os.listdir(os.getcwd())
for f in d:
if test.match(f):
CTIMEOUT = CTIMEOUT + TIMEOUT
- elif CALL in ["mal", "malC", "milM", "milS", "milC", "sql", "xq",
"x100"]:
+ elif CALL in ["mal", "malC", "milS", "milC", "sql", "xq", "x100"]:
CTIMEOUT = CTIMEOUT + TIMEOUT
if CTIMEOUT < TIMEOUT:
CTIMEOUT = TIMEOUT
@@ -2199,9 +2194,9 @@
elif CALL == "python":
cmd = MTO+str(CTO)+" "+exe['python'][1]+" "+TST+EXT+" "+TST+"
"+PRELUDE
RunIt(cmd, "", ClntOut, ClntErr)
- elif CALL in ["mal", "malXs", "milM", "milS", "milMXs", "milSXs"]:
+ elif CALL in ["mal", "malXs", "milS", "milSXs"]:
cmd = '%s%s %s%s --dbname=%s %s ' % (MTO, str(TOT),
exe['Mserver'][1], LOCAL_CONF, TSTDB, PRELUDE)
- if CALL in ["mal", "milM", "milS"]:
+ if CALL in ["mal", "milS"]:
X=""
else:
X="_s[0-9][0-9]"
Index: Mfilter.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mfilter.py.in,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- Mfilter.py.in 18 Aug 2007 22:51:36 -0000 1.149
+++ Mfilter.py.in 12 Sep 2007 08:37:08 -0000 1.150
@@ -190,7 +190,7 @@
## r'^\[ "(?:mapi_params|tmp_62)",\t* *[10],\t* *[10],\t*
*0\t* *\]$',
# src/gdk/cast:
r'^\[ (?:\-|)0 \]$',
- # src/monet/modrefcnt1 &
tests/BugDay_2005-11-09_4.9.3/double_load_double_drop.SF-1082293.milM (on
Itanium)
+ # src/monet/modrefcnt1 &
tests/BugDay_2005-11-09_4.9.3/double_load_double_drop.SF-1082293 (on Itanium)
r"^!ERROR: DESCload: atom 'lock' unknown, in BAT
'[0-9]+'.$",
# pathfinder/tests/XQuery/fn_aps:
r'^0.900000 0.500000 0.400000 (?:\-|)0.000000 0.400000
0.500000 0.900000 1 *$',
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
