Changeset: aa97f95e3c31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa97f95e3c31
Modified Files:
testing/Mfilter.py
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (21 lines):
diff --git a/testing/Mfilter.py b/testing/Mfilter.py
--- a/testing/Mfilter.py
+++ b/testing/Mfilter.py
@@ -81,7 +81,7 @@ bbp_dir = re.compile(r'^(-?\d+) (-?\d+)
norm_in = re.compile('(?:'+')|(?:'.join([
# id: #groups
### r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error, )(unexpected
.* on line |unexpected .* in: )?(.*)\n', # 1: 5
- r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error,
)(?:unexpected .* on line |unexpected .* in: )?(?:.*)\n', #
2: 5
+ r'^(ERROR = !| *!|)(syntax|parse|parse error: syntax)( error(?:,| in:)
)(?:unexpected .* on line |unexpected .* in: )?(?:.*)\n', #
2: 5
r"^(QUERY|ERROR)( =.* connect)( to|)( ')(localhost)(' port )(\d+)( .*)\n",
# 3: 8
r"^([Uu]sage: )(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+:?[ \t].*)\n",
# 4: 3
r'^(ERROR =
!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
# 5: 4
@@ -102,7 +102,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
norm_hint = '# the original non-normalized output was: '
norm_out = (
### None, 'syntax/parse', None, 'unexpected ... on line/in: ', None,
# 1: 5
- None, 'syntax/parse', None,
# 2: 5
+ None, 'syntax/parse', 'error,',
# 2: 5
None, None, None, None, '<HOST>', None, '<MAPIPORT>', None,
# 3: 8
None, '', None,
# 4: 3
None, 'localhost', None,
# 5: 4
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
