From: David Billinghurst <billingd@gcc.gnu.org>
Date: Fri, 9 Jul 2004 15:03:17 +0000 (+0000)
Subject: gfortran-dg.exp (gfortran-dg-test): Adapt regular expression to match gfortran warnin... 
X-Git-Tag: releases/gcc-4.0.0~6847
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4314fac874e24c0c6dad328d0efc04f667a8827;p=thirdparty%2Fgcc.git

gfortran-dg.exp (gfortran-dg-test): Adapt regular expression to match gfortran warning/error messages

2004-07-10  David Billinghurst (David.Billinghurst@riotinto.com)

        * lib/gfortran-dg.exp (gfortran-dg-test):  Adapt regular
        expression to match gfortran warning/error messages

From-SVN: r84375
---

diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp
index f1c47b9c7c93..903d380c02d2 100644
--- a/gcc/testsuite/lib/gfortran-dg.exp
+++ b/gcc/testsuite/lib/gfortran-dg.exp
@@ -26,9 +26,10 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } {
     set output_file [lindex $result 1]
 
     # Put the error message on the same line as the line number
+    # FIXME: Add a colon after 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 
+    # the number pointing to error
+    regsub -all "\n\n\[^\n\]*\n *\[0-9\]*\n" $comp_output ": " comp_output    
 
     return [list $comp_output $output_file]
 }