From fecb60af335958d3730cf847e37c43d8d70de9a4 Mon Sep 17 00:00:00 2001 From: David Billinghurst Date: Fri, 8 Feb 2002 00:38:29 +0000 Subject: [PATCH] prune.exp: Remove "In (program|subroutine"block-data)" message from g77 2002-02-07 David Billinghurst * 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 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/lib/g77-dg.exp | 5 +++++ gcc/testsuite/lib/prune.exp | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcc4fd3..18fa11f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2002-02-07 David Billinghurst + * 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 + 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 396604c..1fc94d2 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 eb391c6..2752634 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 -- 2.7.4