diff options
| author | David Billinghurst <David.Billinghurst@riotinto.com> | 2001-08-15 05:59:41 +0000 |
|---|---|---|
| committer | Toon Moene <toon@gcc.gnu.org> | 2001-08-15 05:59:41 +0000 |
| commit | c384918318641f47518217cfc12f2e668043614c (patch) | |
| tree | aad17a36173bfd756c71dae62f010045e0dbe934 | |
| parent | 61688c33b09fea6215c396322308d9b9c021c860 (diff) | |
| download | gcc-c384918318641f47518217cfc12f2e668043614c.zip gcc-c384918318641f47518217cfc12f2e668043614c.tar.gz gcc-c384918318641f47518217cfc12f2e668043614c.tar.bz2 | |
g77-dg.exp: Use prune.exp for common procedures
2001-08-14 David Billinghurst <David.Billinghurst@riotinto.com>
* lib/g77-dg.exp: Use prune.exp for common procedures
(g77-dg-prune): Replace prune_g77_output with prune_gcc_output
* lib/g77.exp: (g77-dg-prune) Remove
From-SVN: r44916
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g77-dg.exp | 3 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g77.exp | 28 |
3 files changed, 8 insertions, 29 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 69a9450..a52b0e5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2001-08-14 David Billinghurst <David.Billinghurst@riotinto.com> + + * lib/g77-dg.exp: Use prune.exp for common procedures + (g77-dg-prune): Replace prune_g77_output with prune_gcc_output + * lib/g77.exp: (g77-dg-prune) Remove + 2001-08-13 Jason Merrill <jason_merrill@redhat.com> * lib/scanasm.exp (scan-assembler*): Use expr instead of concat. diff --git a/gcc/testsuite/lib/g77-dg.exp b/gcc/testsuite/lib/g77-dg.exp index cb72c36..ba26731 100644 --- a/gcc/testsuite/lib/g77-dg.exp +++ b/gcc/testsuite/lib/g77-dg.exp @@ -18,6 +18,7 @@ load_lib dg.exp load_lib file-format.exp load_lib target-supports.exp load_lib scanasm.exp +load_lib prune.exp if ![info exists TORTURE_OPTIONS] { # It is theoretically beneficial to group all of the O2/O3 options together, @@ -100,7 +101,7 @@ proc g77-dg-test { prog do_what extra_tool_flags } { } proc g77-dg-prune { system text } { - set text [prune_g77_output $text] + set text [prune_gcc_output $text] # If we see "region xxx is full" then the testcase is too big for ram. # This is tricky to deal with in a large testsuite like c-torture so diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp index dad392f..b5287a7 100644 --- a/gcc/testsuite/lib/g77.exp +++ b/gcc/testsuite/lib/g77.exp @@ -153,31 +153,3 @@ proc g77_target_compile { source dest type options } { return [target_compile $source $dest $type $options] } -# Provide a definition of this if missing (delete after next dejagnu release). - -if { [info procs prune_warnings] == "" } then { - proc prune_warnings { text } { - return $text - } -} - -# Prune messages from g77 that aren't useful. - -proc prune_g77_output { text } { - #send_user "Before:$text\n" - regsub -all "(^|\n)\[^\n\]*: In (function|method) \[^\n\]*" $text "" text - regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $text "" text - - # It would be nice to avoid passing anything to g77 that would cause it to - # issue these messages (since ignoring them seems like a hack on our part), - # but that's too difficult in the general case. For example, sometimes - # you need to use -B to point g77 at crt0.o, but there are some targets - # that don't have crt0.o. - regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $text "" text - regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $text "" text - - #send_user "After:$text\n" - - return $text -} - |