Changeset: ba18f0438744 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba18f0438744 Modified Files: testing/Mtest.py.in Branch: Jan2014 Log Message:
Narrow down abort messages that we filter out. Some MAL signatures contain the word "Abort" in the comment. Linux and Windows both produce the message "Aborted" when the server calls abort(). diffs (21 lines): diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -1295,7 +1295,7 @@ def ApproveOutput (env, TST) : # filter = re.compile( "^!WARNING: TCPlisten\([0-9]*\): stopped.$" "|" # "^!WARNING: TCPepilogue: terminate [01] listeners$", re.MULTILINE) - TO = re.compile("(^\+(|[^#]*[\t ])((Memory|Segmentation) [Ff]ault|Bus [Ee]rror|Abort(|ed)|Assertion (|.* )failed[:\.]|!FATAL: BATSIGabort:|ERROR = !Connection terminated|!Mtimeout: Timeout:)([ \t]|$)|aborted too deep recursion)", re.MULTILINE) + TO = re.compile("(^\+(|[^#]*[\t ])((Memory|Segmentation) [Ff]ault|Bus [Ee]rror|Aborted|Assertion (|.* )failed[:\.]|!FATAL: BATSIGabort:|ERROR = !Connection terminated|!Mtimeout: Timeout:)([ \t]|$)|aborted too deep recursion)", re.MULTILINE) for WHAT in EXTENSIONS: testOUTPUT = os.path.join(TSTTRGDIR, "%s.test.%s" % (TST, WHAT)) @@ -2959,7 +2959,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR return None # Try to detect segfaults and the like - TO = re.compile("(^(|[^#]*[\t ])((Memory|Segmentation) [Ff]ault|Bus [Ee]rror|Abort(|ed)|Assertion (|.* )failed[:\.]|!FATAL: BATSIGabort:)([ \t]|$))", re.MULTILINE) + TO = re.compile("(^(|[^#]*[\t ])((Memory|Segmentation) [Ff]ault|Bus [Ee]rror|Aborted|Assertion (|.* )failed[:\.]|!FATAL: BATSIGabort:)([ \t]|$))", re.MULTILINE) # FIXME: this begs for a much nicer solution (100% copy of below) for f in (TestErrFile, TestOutFile): if os.path.isfile(f): _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list