Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27048/MonetDB/src/testing

Modified Files:
      Tag: MonetDB_1-20
        Mfilter.py.in 
Log Message:

normalize Solaris-specific error messages centrally in Mfilter.py


Index: Mfilter.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mfilter.py.in,v
retrieving revision 1.150
retrieving revision 1.150.2.1
diff -u -d -r1.150 -r1.150.2.1
--- Mfilter.py.in       12 Sep 2007 08:37:08 -0000      1.150
+++ Mfilter.py.in       5 Oct 2007 10:34:14 -0000       1.150.2.1
@@ -228,7 +228,8 @@
 norm_in  = re.compile('(?:'+')|(?:'.join([
     r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, )(unexpected 
.* on line |unexpected .* in: )?(.*)\n',                         # 01: 5
     r'^(!ERROR: .*: [0-9]+ times inserted nil due to errors at tuples 
)([0-9]+)(\..*)\n',                                                       # 02: 
3
-    r'^(ERROR =|       )( !ERROR: | !SQLException:assert:| !SQLException:sql: 
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n',         # 03: 5
+    r'^( *!ERROR: shred: cannot stat .*: )(No such file or directory|Error 
0)\n'                                                                # 03a: 2
+    r'^(ERROR =|       )( !ERROR: | !SQLException:assert:| !SQLException:sql: 
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n',         # 03b: 5
     r'^(Connection warning:.*\()(mserver_mal|mserver_sql)(\).*)\n',            
                                                                 # 04: 3
     r'^(ERROR: I/O warning : failed to load external entity ")(.*)(".*)\n',    
                                                                 # 05: 3
     r'^(ERROR: shred:mainSHREDDER: xmlCreateURLParserCtxt\(")(.*)("\) 
failed.*)\n',                                                             # 06: 
3
@@ -248,6 +249,7 @@
     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'^(.*: )(illegal|invalid)( option -- .*)\n'                               
                                                                 # 23: 3
     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)
@@ -256,7 +258,8 @@
 #   None, 'syntax/parse', None, 'unexpected ... on line/in: ', None,           
                         # 01: 5
     None, 'syntax/parse', None, '', '',                                        
                         # 01: 5
     None, '...', None,                                                         
                         # 02: 3
-    None, ' !ERROR', '', ': ', None,                                           
                         # 03: 5
+    None, 'No such file or directory',                                         
                         # 03a: 2
+    None, ' !ERROR', '', ': ', None,                                           
                         # 03b: 5
     None, 'mserver_sql', None,                                                 
                         # 04: 3
     None, '...', None,                                                         
                         # 05: 3
     None, '...', None,                                                         
                         # 06: 3
@@ -276,6 +279,7 @@
     None, '$TSTSRCBASE', None,                                                 
                         # 20: 3
     None, None, None, '<HOST>', None, '<MAPIPORT>', None,                      
                         # 21: 7
     None, '', '', None, None,                                                  
                         # 22: 5
+    None, 'invalid', None,                                                     
                         # 90: 3
     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

Reply via email to