dg-extract-results.py (parse_run): Handle warnings that are printed before a test...

contrib/
	* dg-extract-results.py (parse_run): Handle warnings that are printed
	before a test harness is run.

From-SVN: r210637

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 02a0235232134c9352922ac54a8b4c50c1d3f370..d0f62e57a0579710a03359e3ef4fe3f088c4bbf3 100644 (file)
--- 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 196b6b2eebb9419e58b56bf9dcbced4024333f85..5b2652461e0ccfe4236dae06f0c1a6df868ec4e6 100644 (file)
--- 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)