diff options
| author | billingd <billingd@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-08 00:38:29 +0000 |
|---|---|---|
| committer | billingd <billingd@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-08 00:38:29 +0000 |
| commit | e507e4aa2203f096ececff96139787f3e17400a5 (patch) | |
| tree | 9dc25440b05333baef6d99b9e696646d6265fae8 | |
| parent | 088f179c75e7f00ba18e7bcf4cdfc0947a7b4d80 (diff) | |
| download | ppe42-gcc-e507e4aa2203f096ececff96139787f3e17400a5.tar.gz ppe42-gcc-e507e4aa2203f096ececff96139787f3e17400a5.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49599 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g77-dg.exp | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/prune.exp | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcc4fd35584..18fa11f1cf9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 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 * g77.dg/pr5473.f: Now dg-error. Add additional cases. diff --git a/gcc/testsuite/lib/g77-dg.exp b/gcc/testsuite/lib/g77-dg.exp index 396604cd938..1fc94d2b412 100644 --- 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 eb391c6a279..2752634bc33 100644 --- 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 |
