diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | contrib/dg-extract-results.py | 2 | ||||
-rwxr-xr-x | contrib/dg-extract-results.sh | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2019-10-21 Andrew Burgess <andrew.burgess@embecosm.com> + + * contrib/dg-extract-results.sh: Add support for KPASS. + * contrib/dg-extract-results.py: Likewise. + 2019-10-17 Jason Merrill <jason@redhat.com> * .gitattributes: Avoid {} in filename pattern. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 4e113a8..7100794 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -117,7 +117,7 @@ class Prog: self.tool_re = re.compile (r'^\t\t=== (.*) tests ===$') self.result_re = re.compile (r'^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED' r'|WARNING|ERROR|UNSUPPORTED|UNTESTED' - r'|KFAIL):\s*(.+)') + r'|KFAIL|KPASS):\s*(.+)') self.completed_re = re.compile (r'.* completed at (.*)') # Pieces of text to write at the head of the output. # start_line is a pair in which the first element is a datetime diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 97ac222..f948088 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -326,7 +326,7 @@ BEGIN { } } /^\t\t=== .* ===$/ { curvar = ""; next } -/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ { +/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL|KPASS):/ { testname=\$2 # Ugly hack for gfortran.dg/dg.exp if ("$TOOL" == "gfortran" && testname ~ /^gfortran.dg\/g77\//) |