.

3 files changed, 36 insertions, 17 deletions

diff --git a/tests/date/Makefile.am b/tests/date/Makefile.am
index c042e3846..d4f6f08ed 100644
--- a/tests/date/Makefile.am
+++ b/tests/date/Makefile.am
@@ -7,8 +7,8 @@ maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X \
 U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X \
 W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X \
 rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
-next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.X date2sec-0.X \
-sec2date-0.X
+next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.I utc-1.X date2sec-0.X \
+date2sec-1.X sec2date-0.X
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
 U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \
@@ -18,7 +18,8 @@ rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O \
 rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O \
 next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O \
 next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-1.O \
-utc-1.E date2sec-0.O date2sec-0.E sec2date-0.O sec2date-0.E
+utc-1.E date2sec-0.O date2sec-0.E date2sec-1.O date2sec-1.E sec2date-0.O \
+sec2date-0.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 549a3d5ff..eed0e40a4 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -96,8 +96,8 @@ maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X \
 U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X \
 W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X \
 rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
-next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.X date2sec-0.X \
-sec2date-0.X
+next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.I utc-1.X date2sec-0.X \
+date2sec-1.X sec2date-0.X
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
 U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \
@@ -107,7 +107,8 @@ rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O \
 rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O \
 next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O \
 next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-1.O \
-utc-1.E date2sec-0.O date2sec-0.E sec2date-0.O sec2date-0.E
+utc-1.E date2sec-0.O date2sec-0.E date2sec-1.O date2sec-1.E sec2date-0.O \
+sec2date-0.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/date/date-tests b/tests/date/date-tests
index eb1e8d7a8..2b669d45a 100755
--- a/tests/date/date-tests
+++ b/tests/date/date-tests
@@ -732,40 +732,57 @@ else
   esac
 fi
 test -s utc-0.E || rm -f utc-0.E
-TZ=UTC+2 $xx -d '1970-01-01 00:00:01' +%s  > utc-1.O 2> utc-1.E
+TZ=UTC+1 $xx -u --file=- '+%Y-%m-%d %T' < $srcdir/utc-1.I > utc-1.O 2> utc-1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test utc-1(TZ=UTC+2) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test utc-1(TZ=UTC+1) failed: ../../src/date return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp utc-1.O $srcdir/utc-1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed utc-1(TZ=UTC+2)"; fi ;;
-    1) $echo "Test utc-1(TZ=UTC+2) failed: files utc-1.O and $srcdir/utc-1.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed utc-1(TZ=UTC+1)"; fi ;;
+    1) $echo "Test utc-1(TZ=UTC+1) failed: files utc-1.O and $srcdir/utc-1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test utc-1(TZ=UTC+2) may have failed." 1>&2;
+    2) $echo "Test utc-1(TZ=UTC+1) may have failed." 1>&2;
        $echo The command "cmp utc-1.O $srcdir/utc-1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
 test -s utc-1.E || rm -f utc-1.E
-LANG=C TZ=UTC $xx -d 2000-01-01 +%s  > date2sec-0.O 2> date2sec-0.E
+TZ=UTC+2 $xx -d '1970-01-01 00:00:01' +%s  > date2sec-0.O 2> date2sec-0.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test date2sec-0(LANG=C TZ=UTC) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test date2sec-0(TZ=UTC+2) failed: ../../src/date return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp date2sec-0.O $srcdir/date2sec-0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed date2sec-0(LANG=C TZ=UTC)"; fi ;;
-    1) $echo "Test date2sec-0(LANG=C TZ=UTC) failed: files date2sec-0.O and $srcdir/date2sec-0.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed date2sec-0(TZ=UTC+2)"; fi ;;
+    1) $echo "Test date2sec-0(TZ=UTC+2) failed: files date2sec-0.O and $srcdir/date2sec-0.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test date2sec-0(LANG=C TZ=UTC) may have failed." 1>&2;
+    2) $echo "Test date2sec-0(TZ=UTC+2) may have failed." 1>&2;
        $echo The command "cmp date2sec-0.O $srcdir/date2sec-0.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
 test -s date2sec-0.E || rm -f date2sec-0.E
+LANG=C TZ=UTC $xx -d 2000-01-01 +%s  > date2sec-1.O 2> date2sec-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test date2sec-1(LANG=C TZ=UTC) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp date2sec-1.O $srcdir/date2sec-1.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed date2sec-1(LANG=C TZ=UTC)"; fi ;;
+    1) $echo "Test date2sec-1(LANG=C TZ=UTC) failed: files date2sec-1.O and $srcdir/date2sec-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test date2sec-1(LANG=C TZ=UTC) may have failed." 1>&2;
+       $echo The command "cmp date2sec-1.O $srcdir/date2sec-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s date2sec-1.E || rm -f date2sec-1.E
 LANG=C TZ=UTC $xx -d '1970-01-01 UTC 946684800 sec' +'%Y-%m-%d %T %z'  > sec2date-0.O 2> sec2date-0.E
 code=$?
 if test $code != 0 ; then
@@ -784,7 +801,7 @@ else
 fi
 test -s sec2date-0.E || rm -f sec2date-0.E
 if test $errors = 0 ; then
-  $echo Passed all 45 tests. 1>&2
+  $echo Passed all 46 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi