diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-10-25 23:18:41 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-10-25 23:18:41 +0000 |
| commit | 0cec14923830569b8727d461bcf64adaf965de83 (patch) | |
| tree | 39212625ea993fb193b64da0b13d64cd323dc23b /contrib | |
| parent | f67dc76907675065f34ed0bd14915df8d0b63b2d (diff) | |
| parent | 9bdc2a8f06cef54650798fcb4c343e4415fd5992 (diff) | |
| download | gcc-0cec14923830569b8727d461bcf64adaf965de83.zip gcc-0cec14923830569b8727d461bcf64adaf965de83.tar.gz gcc-0cec14923830569b8727d461bcf64adaf965de83.tar.bz2 | |
Merge from trunk revision 277462.
From-SVN: r277464
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dg-extract-results.py | 2 | ||||
| -rwxr-xr-x | contrib/dg-extract-results.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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\//) |