Remove fall-back prune_warnings

No one should be using versions of dejagnu without prune_warnings,
which was available in 1996 (dejagnu-1.3).

binutils/
	* testsuite/lib/binutils-common.exp: Remove fallback prune_warnings.
gas/
	* testsuite/lib/gas-defs.exp: Remove fallback prune_warnings.

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 7e6bf16ee6e8bdbce5276969410c2029b3cfd9a7..b944d0af3bc77f322a15af82cf9efb10a97ddb32 100644 (file)
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -672,28 +672,7 @@ proc prune_warnings_extra { text } {
     return $text
 }
 
-# This definition is taken from an unreleased version of DejaGnu.  Once
-# that version gets released, and has been out in the world for a few
-# months at least, it may be safe to delete this copy.
-if ![string length [info proc prune_warnings]] {
-    #
-    # prune_warnings -- delete various system verbosities from TEXT
-    #
-    # An example is:
-    # ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9
-    #
-    # Sites with particular verbose os's may wish to override this in site.exp.
-    #
-    proc prune_warnings { text } {
-       # This is from sun4's.  Do it for all machines for now.
-       # The "\\1" is to try to preserve a "\n" but only if necessary.
-       regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text
-       # It might be tempting to get carried away and delete blank lines, etc.
-       # Just delete *exactly* what we're ask to, and that's it.
-       set text [prune_warnings_extra $text]
-       return $text
-    }
-} elseif { [info procs saved-prune_warnings] == [list] } {
+if { [info procs saved-prune_warnings] == [list] } {
     rename prune_warnings saved-prune_warnings
     proc prune_warnings { text } {
        set text [saved-prune_warnings $text]

diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index 3e134ca8fa06833984d045766f1c72e9415b40c3..dbd35e9cb563933e28bbeb27433d818224ff758f 100644 (file)
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -357,32 +357,9 @@ proc verbose_eval { expr { level 1 } } {
     if $verbose>$level then { eval verbose "$expr" $level }
 }
 
-# This definition is taken from an unreleased version of DejaGnu.  Once
-# that version gets released, and has been out in the world for a few
-# months at least, it may be safe to delete this copy.
-
 if { [istarget loongarch*-*-*] } {
     rename prune_warnings prune_warnings_other
 }
-if ![string length [info proc prune_warnings]] {
-    #
-    # prune_warnings -- delete various system verbosities from TEXT.
-    #
-    # An example is:
-    # ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9
-    #
-    # Sites with particular verbose os's may wish to override this in site.exp.
-    #
-    proc prune_warnings { text } {
-       # This is from sun4's.  Do it for all machines for now.
-       # The "\\1" is to try to preserve a "\n" but only if necessary.
-       regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text
-
-       # It might be tempting to get carried away and delete blank lines, etc.
-       # Just delete *exactly* what we're ask to, and that's it.
-       return $text
-    }
-}
 
 # run_list_test NAME (optional): OPTS TESTNAME
 #