diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-06-25 02:48:14 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-06-25 02:48:14 +0000 |
| commit | 274af60a2a71cacc4a24918d35be70bcead90e00 (patch) | |
| tree | 03785d49313fbe2be443ca2c5737cdf2a4f87ba8 /gcc | |
| parent | 35fea1100d4d2a870c0a50064ddd89e3df6d8eed (diff) | |
| download | gcc-274af60a2a71cacc4a24918d35be70bcead90e00.zip gcc-274af60a2a71cacc4a24918d35be70bcead90e00.tar.gz gcc-274af60a2a71cacc4a24918d35be70bcead90e00.tar.bz2 | |
re PR libfortran/32456 (IO error message should show Unit/Filename)
2007-06-24 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/32456
* gfortran.dg/secnds-1.f: Revise test to reduce random errors.
From-SVN: r125996
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/secnds-1.f | 23 |
2 files changed, 20 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3922d47..82ac1ce 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2007-06-24 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/32456 + * gfortran.dg/secnds-1.f: Revise test to reduce random errors. + +2007-06-24 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/32456 * gfortran.dg/error_format.f90: New test. 2007-06-24 Paul Thomas <pault@gcc.gnu.org> diff --git a/gcc/testsuite/gfortran.dg/secnds-1.f b/gcc/testsuite/gfortran.dg/secnds-1.f index 5ac2bce..c5f5283 100644 --- a/gcc/testsuite/gfortran.dg/secnds-1.f +++ b/gcc/testsuite/gfortran.dg/secnds-1.f @@ -6,18 +6,25 @@ C Contributed by Paul Thomas <pault@gcc.gnu.org> C character*20 dum1, dum2, dum3 real t1, t1a, t2, t2a - real*8 dat1, dat2 - integer i, j, values(8) + real*4 dat1, dat2 + integer i, j, values(8), k t1 = secnds (0.0) call date_and_time (dum1, dum2, dum3, values) t1a = secnds (0.0) - dat1 = 0.001*real (values(8)) + real (values(7)) + - & 60.0*real (values(6)) + 3600.0* real (values(5)) - if (((dat1 - t1) < 0.) .or. ((dat1 - t1) > (t1a - t1))) call abort () + dat1 = 0.001 * real(values(8)) + real(values(7)) + + & 60.0 * real(values(6)) + 3600.0 * real(values(5)) + ! handle midnight shift + if ((t1a - t1) < -12.0*3600.0 ) t1 = t1 - 24.0*3600.0 + if ((t1a - dat1) < -12.0*3600.0 ) dat1 = dat1 - 24.0*3600.0 + if ((dat1 < nearest(t1, -1.)) .or. (dat1 > nearest(t1a, 1.))) + & call abort () t2a = secnds (t1a) call date_and_time (dum1, dum2, dum3, values) t2 = secnds (t1) - dat2 = 0.001*real (values(8)) + real (values(7)) + - & 60.0*real (values(6)) + 3600.0* real (values(5)) - if (((dat2 - dat1) < t2a) .or. ((dat2 - dat1) > t2)) call abort () + dat2 = 0.001 * real(values(8)) + real(values(7)) + + & 60.0 * real(values(6)) + 3600.0 * real(values(5)) + ! handle midnight shift + if ((dat2 - dat1) < -12.0*3600.0 ) dat1 = dat1 - 24.0*3600.0 + if (((dat2 - dat1) < t2a - 0.008) .or. + & ((dat2 - dat1) > t2 + 0.008)) call abort () end |