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
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.
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]
}
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