diff options
| author | Tobias Schlüter <tobi@gcc.gnu.org> | 2005-02-21 17:31:42 +0100 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2005-02-21 17:31:42 +0100 |
| commit | f65ca04d8d41f23d075edd71fff1d685f5e4db4b (patch) | |
| tree | d4f0e5dc6da3229ff73476d01cc2ca587c701d44 | |
| parent | 0b612e0bc78db837f362a4986dfd843cd98d7880 (diff) | |
| download | gcc-f65ca04d8d41f23d075edd71fff1d685f5e4db4b.zip gcc-f65ca04d8d41f23d075edd71fff1d685f5e4db4b.tar.gz gcc-f65ca04d8d41f23d075edd71fff1d685f5e4db4b.tar.bz2 | |
Fix law's ChangeLog date, and
Fix law's ChangeLog date, and
* lib/gfortran-dg.exp (gfortran-dg-test): Split long regexps.
From-SVN: r95335
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gfortran-dg.exp | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d7200a6..0eae765 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,8 @@ -2005-01-31 Jeff Law <law@redhat.com> +2005-02-21 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> + + * lib/gfortran-dg.exp (gfortran-dg-test): Split long regexps. + +2005-02-21 Jeff Law <law@redhat.com> * gcc.dg/tree-ssa/20041122-1.c: New test for missing optimization. diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index d6887b0..247df02 100644 --- a/gcc/testsuite/lib/gfortran-dg.exp +++ b/gcc/testsuite/lib/gfortran-dg.exp @@ -55,8 +55,17 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } { # [name]:[line2]: Error: Some error at (1) and (2) # We proceed in two steps: first we deal with the form with two # different locus lines, then with the form with only one locus line. - regsub -all " In file (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n In file (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n(\[^\n\]*)\n" $comp_output "\\1: \\3\n\\2: \\3\n" comp_output - regsub -all " In file (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n(\[^\n\]*)\n" $comp_output "\\1: \\2\n" comp_output + # + # 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 diag_regexp "(\[^\n\]*)\n" + + set two_loci "$locus_regexp$locus_regexp$diag_regexp" + set single_locus "$locus_regexp$diag_regexp" + regsub -all $two_loci $comp_output "\\1: \\3\n\\2: \\3\n" comp_output + regsub -all $single_locus $comp_output "\\1: \\2\n" comp_output return [list $comp_output $output_file] } |