Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16949/MonetDB/src/testing
Modified Files:
Mfilter.py.in
Log Message:
improved filtering/normalization of file/path names in usage messages
(mainly) in case tests are run via `make check` / `sh RunMtest`
Index: Mfilter.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mfilter.py.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- Mfilter.py.in 10 Aug 2007 17:43:45 -0000 1.148
+++ Mfilter.py.in 18 Aug 2007 22:51:36 -0000 1.149
@@ -57,7 +57,6 @@
## r"^Mcreatedb: using default dbdir ",
## r"^Mcreatedb: calling .Mserver .*-db .* for the first
time..$",
## r"^Mcreatedb: database .* has been initialized
succesfully!$",
- r"^[Uu]sage:
(?:/.*/)?(?:lt-)?(?:Mserver|MapiClient|msqldump)(?: \[ options \])?(?: \[
script\+ \])? *$",
r"^!WARNING: GDKlockHome: created directory .*$",
r"^!WARNING: GDKlockHome: ignoring empty or invalid
.gdk_lock.$",
r"^!WARNING: BBPdir: initializing BBP.$",
@@ -248,6 +247,7 @@
r'^(bad usage of XML namespaces: at )(.*)\n',
# 19: 2
r'^(QUERY = import rpc-module namespace xrpc =
"http://www.monetdb.nl/basicfunctions"; at
")(/.*)(/tests/XRpc/basic_queries/Tests/basicfunctions.xq";)\n', # 20: 3
r"^(QUERY = connect)( to|)( ')(localhost)(' port )([0-9]+)( .*)\n",
# 21: 7
+ r"^([Uu]sage: )(/.*/|)(lt-|)([A-Za-z0-9_]+)([ \t].*)\n",
# 22: 5
r'^(.*: at )(\([0-9]+,[0-9]+\-[0-9]+,[0-9]+\))(: .*)\n',
# 90: 3
r'^(fatal error|ERROR)(: err:FORG0005, fn:exactly-one called with a
sequence containing zero or more than one item..*)()\n', # 99: 3
])+')', re.MULTILINE)
@@ -275,6 +275,7 @@
None, '...',
# 19: 2
None, '$TSTSRCBASE', None,
# 20: 3
None, None, None, '<HOST>', None, '<MAPIPORT>', None,
# 21: 7
+ None, '', '', None, None,
# 22: 5
None, '...', None,
# 90: 3
'=ERROR', None, '\n#',
# 99: 3
## '=ERROR', None, '''
-------------------------------------------------------------------------
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
