aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2014-05-20 10:08:59 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2014-05-20 10:08:59 +0000
commit768b94bc2dc1063d34447aa7252e7a2f9a0a491d (patch)
tree7b16ed20df7376ded66956cd1f99ca79256a43bf /contrib
parent8f0e7f6f6baab4910f91509466dda26de42035de (diff)
downloadgcc-768b94bc2dc1063d34447aa7252e7a2f9a0a491d.zip
gcc-768b94bc2dc1063d34447aa7252e7a2f9a0a491d.tar.gz
gcc-768b94bc2dc1063d34447aa7252e7a2f9a0a491d.tar.bz2
dg-extract-results.py (parse_run): Handle warnings that are printed before a test harness is run.
contrib/ * dg-extract-results.py (parse_run): Handle warnings that are printed before a test harness is run. From-SVN: r210637
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog5
-rw-r--r--contrib/dg-extract-results.py6
2 files changed, 10 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 02a0235..d0f62e5 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-20 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * dg-extract-results.py (parse_run): Handle warnings that are printed
+ before a test harness is run.
+
2014-05-09 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config-list.mk (show): New target.
diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py
index 196b6b2..5b26524 100644
--- a/contrib/dg-extract-results.py
+++ b/contrib/dg-extract-results.py
@@ -264,8 +264,12 @@ class Prog:
# the harness segment, so that if a run for a particular harness
# has been split up, we can reassemble the individual segments
# in a sensible order.
+ #
+ # dejagnu sometimes issues warnings about the testing environment
+ # before running any tests. Treat them as part of the header
+ # rather than as a test result.
match = self.result_re.match (line)
- if match:
+ if match and (harness or not line.startswith ('WARNING:')):
if not harness:
self.fatal (filename, 'saw test result before harness name')
name = match.group (2)