From aa7710cb6c2f019760fcafd37a8ab99ac897fa2b Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 21 Oct 2019 13:41:29 +0100 Subject: [PATCH] contrib: Add KPASS support to dg-extract-results.{sh,py} Extend dg-extract-results.sh and dg-extract-results.py to support the KPASS test result status. This is required by GDB which uses a copy of the dg-extract-results.{sh,py} scripts that it tries to keep in sync with GCC. ChangeLog: * contrib/dg-extract-results.sh: Add support for KPASS. * contrib/dg-extract-results.py: Likewise. From-SVN: r277260 --- ChangeLog | 5 +++++ contrib/dg-extract-results.py | 2 +- contrib/dg-extract-results.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5487226c989..bff525fe8fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-10-21 Andrew Burgess + + * contrib/dg-extract-results.sh: Add support for KPASS. + * contrib/dg-extract-results.py: Likewise. + 2019-10-17 Jason Merrill * .gitattributes: Avoid {} in filename pattern. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 4e113a8dd6b..7100794d42a 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 97ac222b54a..f948088370e 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\//) -- 2.30.2