diff options
| author | brooks <brooks@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 05:07:59 +0000 |
|---|---|---|
| committer | brooks <brooks@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 05:07:59 +0000 |
| commit | d544e7d32e6c6901358ee5465a633aaf49690512 (patch) | |
| tree | 18db1836cca5530ca6b489060f520e9e3da8ac3a /gcc/testsuite/lib/gfortran-dg.exp | |
| parent | efb8e7bfec8ddbeee198a20c1bf6f90e909e4a2a (diff) | |
| download | gcc-d544e7d32e6c6901358ee5465a633aaf49690512.tar.gz | |
* fortran/error.c (show_locus): Remove "In file" from error messages.
* testsuite/lib/gfortran-dg.exp (gfortran-dg-test): Remove expected "In file" from error
messages.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118450 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/lib/gfortran-dg.exp')
| -rw-r--r-- | gcc/testsuite/lib/gfortran-dg.exp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index 6ceb7fc3255..421e4a49eac 100644 --- a/gcc/testsuite/lib/gfortran-dg.exp +++ b/gcc/testsuite/lib/gfortran-dg.exp @@ -26,23 +26,23 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } { set output_file [lindex $result 1] # gfortran error messages look like this: - # In file [name]:[line] + # [name]:[line] # # some code # 1 - # Error: Some error at (1) and (2) + # Error: Some error at (1) # or - # In file [name]:[line] + # [name]:[line] # # some code # 1 - # In file [name]:[line2] + # [name]:[line2] # # some other code # 2 # Error: Some error at (1) and (2) # or - # In file [name]:[line] + # [name]:[line] # # some code and some more code # 1 2 @@ -59,7 +59,7 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } { # Note that these regexps only make sense in the combinations used below. # Note also that is imperative that we first deal with the form with # two loci. - set locus_regexp " In file (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n" + set locus_regexp " (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n" set diag_regexp "(\[^\n\]*)\n" set two_loci "$locus_regexp$locus_regexp$diag_regexp" |