prune.exp: Remove "In (program|subroutine"block-data)" message from g77

2002-02-07  David Billinghurst <David.Billinghurst@riotinto.com>

	* lib/prune.exp: Remove "In (program|subroutine"block-data)"
	message from g77
	* lib/g77-dg.exp: Trim g77 error messages so that they are
	recognised by dg.exp.

From-SVN: r49599

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dcc4fd35584e134e465bf21213acce34e9707222..18fa11f1cf905f0a00a3efdf39188381cba9d89e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-07  David Billinghurst <David.Billinghurst@riotinto.com>
+
+       * lib/prune.exp: Remove "In (program|subroutine"block-data)"
+       message from g77
+       * lib/g77-dg.exp: Trim g77 error messages so that they are
+       recognised by dg.exp.
+
 2002-02-07  David Billinghurst <David.Billinghurst@riotinto.com>
 
        PR fortran/5473

diff --git a/gcc/testsuite/lib/g77-dg.exp b/gcc/testsuite/lib/g77-dg.exp
index 396604cd9382f92d212890eddf7d97002ea25bb5..1fc94d2b412eb8e1014c5fa769094a4e6d312743 100644 (file)
--- a/gcc/testsuite/lib/g77-dg.exp
+++ b/gcc/testsuite/lib/g77-dg.exp
@@ -97,6 +97,11 @@ proc g77-dg-test { prog do_what extra_tool_flags } {
 
     set comp_output [g77_target_compile "$prog" "$output_file" "$compile_type" $options];
 
+    # Put the error message on the same line as the line number
+    # Remove the line of source code with the error and
+    # the "     ^" that points to error
+    regsub -all "\n\[^\n\]*\n *\\^\n" $comp_output "" comp_output 
+
     return [list $comp_output $output_file]
 }
 

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index eb391c6a27958b1458aa564c171e6d3c7f2abefb..2752634bc339db1e1b5d6a1e85c63748dca6abcc 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -19,7 +19,7 @@
 proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
 
-    regsub -all "(^|\n)\[^\n\]*: In (function|member|method|constructor|instantiation) \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: In (function|member|method|constructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text