diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-06-06 00:54:30 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-06-06 00:54:30 +0000 |
| commit | 766a8f62625affcdbb50b68c8b7c4d20c7c23977 (patch) | |
| tree | 14311a3f90b7488d0b426117b1c9c723f66a057f /gcc | |
| parent | ee8e242435706dfa09d98abe249e9a99404b6e62 (diff) | |
| download | gcc-766a8f62625affcdbb50b68c8b7c4d20c7c23977.zip gcc-766a8f62625affcdbb50b68c8b7c4d20c7c23977.tar.gz gcc-766a8f62625affcdbb50b68c8b7c4d20c7c23977.tar.bz2 | |
re PR testsuite/32057 (Random failure on gfortran.dg/secnds.f)
2007-06-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR testsuite/32057
* gfortran.dg/secnds.f: Update test to avoid roundoff errors and
midnight issues.
From-SVN: r125352
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/secnds.f | 23 |
2 files changed, 21 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 10ca748..58d3b77 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2007-06-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR testsuite/32057 + * gfortran.dg/secnds.f: Update test to avoid roundoff errors and + midnight issues. + 2007-06-05 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR testsuite/25241 diff --git a/gcc/testsuite/gfortran.dg/secnds.f b/gcc/testsuite/gfortran.dg/secnds.f index 7541a05..3131598 100644 --- a/gcc/testsuite/gfortran.dg/secnds.f +++ b/gcc/testsuite/gfortran.dg/secnds.f @@ -6,14 +6,18 @@ 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 () do j=1,10000 do i=1,10000 end do @@ -21,7 +25,10 @@ C 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 |