f-torture.exp (f_torture_compile): Prune the warnings before testing that no relevant...

* lib/f-torture.exp (f_torture_compile): Prune the warnings before
testing that no relevant ones were found.

From-SVN: r38944

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 31a45bf17b43d51317c877942b38d65a1009315b..52c7aed7b0d43a157906044c074a27d7cc0af4d6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-12  Richard Earnshaw <rearnsha@arm.com>
+
+       * lib/f-torture.exp (f_torture_compile): Prune the warnings before
+       testing that no relevant ones were found.
+
 2001-01-12  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.old-deja/g++.pt/cast2.C: New test.

diff --git a/gcc/testsuite/lib/f-torture.exp b/gcc/testsuite/lib/f-torture.exp
index b8721a5029541ddff4ef965347f36e96f3ad0962..b9ae904440a02b3f6934c3908397b42d3351bec6 100644 (file)
--- a/gcc/testsuite/lib/f-torture.exp
+++ b/gcc/testsuite/lib/f-torture.exp
@@ -89,6 +89,9 @@ proc f-torture-compile { src option } {
        return
     }
 
+    # Prune warnings we know are unwanted.
+    set comp_output [prune_warnings $comp_output]
+
     # We shouldn't get these because of -w, but just in case.
     if [string match "*77*:*warning:*" $comp_output] then {
        warning "$testcase: (with warnings) $option"
@@ -98,8 +101,6 @@ proc f-torture-compile { src option } {
        return
     }
 
-    set comp_output [prune_warnings $comp_output]
-
     set unsupported_message [g77_check_unsupported_p $comp_output]
     if { $unsupported_message != "" } {
        unsupported "$testcase: $unsupported_message"