* RE: gfortran.dg testsuite patch (committed)
@ 2004-07-09 16:04 Billinghurst, David (CALCRTS)
0 siblings, 0 replies; 6+ messages in thread
From: Billinghurst, David (CALCRTS) @ 2004-07-09 16:04 UTC (permalink / raw)
To: Paul Brook, fortran; +Cc: gcc-patches, tobias.schlueter
> From: Paul Brook
>
>> 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
>> * gfortran.dg/g77/12632.f: Copy from g77.dg and fix
>> dg-error text.
>
> Looks like you forgot to actually apply the patch before committing :)
>
> Paul
Close. Forgot to commit after patching and testing. Fixed.
david
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: gfortran.dg testsuite patch (committed)
2004-07-09 16:23 ` Tobias Schlüter
@ 2004-07-09 16:49 ` Tobias Schlüter
0 siblings, 0 replies; 6+ messages in thread
From: Tobias Schlüter @ 2004-07-09 16:49 UTC (permalink / raw)
To: Billinghurst, David (CALCRTS); +Cc: gcc-patches, fortran
Paul suggested that I should also allow '.[fF]95' as suffixes, so I
chose to use a wildcard again. Verified that the wildcard works,
installed as below.
- Tobi
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/ChangeLog,v
retrieving revision 1.3968
diff -u -r1.3968 ChangeLog
--- ChangeLog 9 Jul 2004 15:29:45 -0000 1.3968
+++ ChangeLog 9 Jul 2004 15:46:13 -0000
@@ -1,3 +1,9 @@
+2004-07-09 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+ Paul Brook <paul@codesourcery.com>
+
+ * gfortran.dg/dg.exp: Use revised wilcard for suffixes, also allow
+ '.f95' and '.F95'.
+
2004-07-09 Diego Novillo <dnovillo@redhat.com>
* gcc.dg/tree-ssa/20031015-1.c: Adjust expected dump file name.
Index: gfortran.dg/dg.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/dg.exp,v
retrieving revision 1.2
diff -u -r1.2 dg.exp
--- gfortran.dg/dg.exp 9 Jul 2004 15:20:43 -0000 1.2
+++ gfortran.dg/dg.exp 9 Jul 2004 15:46:13 -0000
@@ -29,23 +29,12 @@
dg-init
# Main loop.
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f ] ]\
- $DEFAULT_FFLAGS
+gfortran-dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ]
$DEFAULT_FFLAGS
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F ] ]\
- $DEFAULT_FFLAGS
+gfortran-dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f90 ] ]\
- $DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F90 ] ]\
- $DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.f ] ] \
- $DEFAULT_FFLAGS
-
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.F ] ] \
- $DEFAULT_FFLAGS
# All done.
dg-finish
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: gfortran.dg testsuite patch (committed)
2004-07-09 15:31 Billinghurst, David (CALCRTS)
2004-07-09 15:51 ` Tobias Schlüter
2004-07-09 15:52 ` Paul Brook
@ 2004-07-09 16:23 ` Tobias Schlüter
2004-07-09 16:49 ` Tobias Schlüter
2 siblings, 1 reply; 6+ messages in thread
From: Tobias Schlüter @ 2004-07-09 16:23 UTC (permalink / raw)
To: Billinghurst, David (CALCRTS); +Cc: gcc-patches, fortran
Billinghurst, David (CALCRTS) wrote:
> It now "works for me". I will now let the testsuite settle while
> we shake out any problems from other platforms.
>
> Tobi - see how you go with your tests. Let me know if I can
> help.
I fixed a minor nit with the below, obviously correct fix: the wildcard
in dg.exp would also match emacs-style backup files, i.e. files ending
in .f90~. While I was at it, I also added the necessary code for running
tests with uppercase suffixes, as we might add testcases which need
preprocessing.
I have also added the promised testcase from PRs 13575 and 15978 to the
dg testsuite. Woohoo!
Thanks,
- Tobi
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/ChangeLog,v
retrieving revision 1.3966
diff -u -r1.3966 ChangeLog
--- ChangeLog 9 Jul 2004 15:11:39 -0000 1.3966
+++ ChangeLog 9 Jul 2004 15:15:36 -0000
@@ -1,5 +1,10 @@
2004-07-09 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+ * gfortran.dg/dg.exp: Don't use wildcard for suffixes, also check
+ testcases with capital suffix.
+
+2004-07-09 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+
PR fortran/15481
PR fortran/13372
PR fortran/13575
Index: gfortran.dg/dg.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/dg.exp,v
retrieving revision 1.1
diff -u -r1.1 dg.exp
--- gfortran.dg/dg.exp 8 Jul 2004 23:12:47 -0000 1.1
+++ gfortran.dg/dg.exp 9 Jul 2004 15:15:36 -0000
@@ -29,12 +29,23 @@
dg-init
# Main loop.
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f* ] ]\
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f ] ]\
+ $DEFAULT_FFLAGS
+
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F ] ]\
+ $DEFAULT_FFLAGS
+
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.f90 ] ]\
+ $DEFAULT_FFLAGS
+
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.F90 ] ]\
$DEFAULT_FFLAGS
gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.f ] ] \
$DEFAULT_FFLAGS
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/g77/*.F ] ] \
+ $DEFAULT_FFLAGS
# All done.
dg-finish
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: gfortran.dg testsuite patch (committed)
2004-07-09 15:31 Billinghurst, David (CALCRTS)
2004-07-09 15:51 ` Tobias Schlüter
@ 2004-07-09 15:52 ` Paul Brook
2004-07-09 16:23 ` Tobias Schlüter
2 siblings, 0 replies; 6+ messages in thread
From: Paul Brook @ 2004-07-09 15:52 UTC (permalink / raw)
To: fortran; +Cc: Billinghurst, David (CALCRTS), gcc-patches, tobias.schlueter
> 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
> * gfortran.dg/g77/12632.f: Copy from g77.dg and fix
> dg-error text.
Looks like you forgot to actually apply the patch before committing :)
Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: gfortran.dg testsuite patch (committed)
2004-07-09 15:31 Billinghurst, David (CALCRTS)
@ 2004-07-09 15:51 ` Tobias Schlüter
2004-07-09 15:52 ` Paul Brook
2004-07-09 16:23 ` Tobias Schlüter
2 siblings, 0 replies; 6+ messages in thread
From: Tobias Schlüter @ 2004-07-09 15:51 UTC (permalink / raw)
To: Billinghurst, David (CALCRTS); +Cc: gcc-patches, fortran
Billinghurst, David (CALCRTS) wrote:
> It now "works for me". I will now let the testsuite settle while
> we shake out any problems from other platforms.
>
> Tobi - see how you go with your tests. Let me know if I can
> help.
Well, I just updated, and 12632.f fails with excess errors. I'll see if
this is a local problem.
Thanks,
- Tobi
^ permalink raw reply [flat|nested] 6+ messages in thread
* gfortran.dg testsuite patch (committed)
@ 2004-07-09 15:31 Billinghurst, David (CALCRTS)
2004-07-09 15:51 ` Tobias Schlüter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Billinghurst, David (CALCRTS) @ 2004-07-09 15:31 UTC (permalink / raw)
To: gcc-patches; +Cc: fortran, tobias.schlueter
This "obvious" tweak fixes the regexp in the gfortran.dg driver
that collapses the gfortran error|warning messages to a single
line. It may need further tweaks as we add more tests.
I have also copied across a g77 test to show that it works.
It now "works for me". I will now let the testsuite settle while
we shake out any problems from other platforms.
Tobi - see how you go with your tests. Let me know if I can
help.
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
* gfortran.dg/g77/12632.f: Copy from g77.dg and fix
dg-error text.
Index: gfortran-dg.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/gfortran-dg.exp,v
retrieving revision 1.1
diff -u -r1.1 gfortran-dg.exp
--- gfortran-dg.exp 8 Jul 2004 23:12:47 -0000 1.1
+++ gfortran-dg.exp 9 Jul 2004 14:16:07 -0000
@@ -26,9 +26,10 @@
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]
}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-07-09 15:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-07-09 16:04 gfortran.dg testsuite patch (committed) Billinghurst, David (CALCRTS)
-- strict thread matches above, loose matches on Subject: below --
2004-07-09 15:31 Billinghurst, David (CALCRTS)
2004-07-09 15:51 ` Tobias Schlüter
2004-07-09 15:52 ` Paul Brook
2004-07-09 16:23 ` Tobias Schlüter
2004-07-09 16:49 ` Tobias Schlüter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).