From: aburgess <aburgess@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Oct 2019 12:41:29 +0000 (+0000)
Subject: contrib: Add KPASS support to dg-extract-results.{sh,py}
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ec5a549fa6120fc03cf938533a8630ab62a05d;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277260 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/ChangeLog b/ChangeLog
index 5487226c9898..bff525fe8fd2 100644
--- 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 4e113a8dd6bb..7100794d42ae 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 97ac222b54a6..f948088370e1 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\//)