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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125352 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 10ca748..58d3b77 100644 (file)
--- 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 (file)
--- 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