git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
David Billinghurst 2002-02-08 00:38:29 +00:00 committed by David Billinghurst
parent b6878a45f7
commit fecb60af33
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/testsuite/ChangeLog
View File

@ -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> 2002-02-07 David Billinghurst <David.Billinghurst@riotinto.com>
PR fortran/5473 PR fortran/5473

5
gcc/testsuite/lib/g77-dg.exp
View File

@ -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]; 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] return [list $comp_output $output_file]
} }

2
gcc/testsuite/lib/prune.exp
View File

@ -19,7 +19,7 @@
proc prune_gcc_output { text } { proc prune_gcc_output { text } {
#send_user "Before:$text\n" #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)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text