Changeset: a76e6ac4ac4c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a76e6ac4ac4c
Modified Files:
        testing/Mfilter.py.in
Branch: Aug2011
Log Message:

correctly handle Windows paths


diffs (14 lines):

diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -86,8 +86,8 @@ norm_in  = re.compile('(?:'+')|(?:'.join
     r"^(QUERY|ERROR)( =.* connect)( to|)( ')(localhost)(' port )([0-9]+)( 
.*)\n",                                                               # 21: 8
     r"^([Uu]sage: )(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+:?[ \t].*)\n",          
                                                                 # 22: 3
     
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
                                                        # 25: 3
-    r"^(DBD::monetdb::db table_info warning: Catalog parameter '' ignored at 
)([\./].+|[A-Z]:\\.+)(/[^/]+\.pl line [0-9]+\.)\n",                # 27: 3
-    r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at 
)([\./].+|[A-Z]:\\.+)(/[^/]+\.pm line [0-9]+\.)\n',                             
# 28: 4
+    r"^(DBD::monetdb::db table_info warning: Catalog parameter '' ignored at 
)([\./].+|[A-Z]:\\.+[/\\])([^/\\]+\.pl line [0-9]+\.)\n",          # 27: 3
+    r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at 
)([\./].+|[A-Z]:\\.+[/\\])([^/\\]+\.pm line [0-9]+\.)\n',                       
# 28: 4
 # filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere
     r"^(ERROR = !MALException:wkb.FromText:ParseException: Expected )('EMPTY' 
or '\(')( but encountered : '\)')\n",                             # 29: 3
 ])+')',  re.MULTILINE)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to