diff options
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/dg-extract-results.py | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 02a02352321..d0f62e57a05 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 196b6b2eebb..5b2652461e0 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) |