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

diff --git a/ChangeLog b/ChangeLog
index 5487226c98983aec3ef6c9e8dca81abacaaecc99..bff525fe8fd2f7df1c8836e6b14a817b5bd257db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 4e113a8dd6bbbc7e2d48c2d7d2c475bebad37e9c..7100794d42ae4de75d0f0ac854de6b7b21309137 100644 (file)
--- 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 97ac222b54a62c9fcd22a862fd491b8f760cbd7f..f948088370e15de73181ca33950ef18c12356aa0 100755 (executable)
--- 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\//)