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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d7200a647f0329fe840c726d89124aa9f949b213..0eae7654672b63c4e7d7e774dedb8322e6f6ee88 100644 (file)
--- 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 d6887b050e2970e5eb99cdf82775b16118059fe8..247df02bd0c178b7dc62b660113c9ab2e9b41f7f 100644 (file)
--- 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]
 }