diff options
| -rw-r--r-- | tests/date/Makefile.am | 20 | ||||
| -rwxr-xr-x | tests/date/date-tests | 20 |
2 files changed, 11 insertions, 29 deletions
diff --git a/tests/date/Makefile.am b/tests/date/Makefile.am index 2cdd7bdb8..990ff567e 100644 --- a/tests/date/Makefile.am +++ b/tests/date/Makefile.am @@ -3,16 +3,16 @@ ##test-files-begin x = date explicit = -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-0a.X utc-1.I utc-1.X \ -utc-1a.I utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X \ -this-m.X this-h.X this-w.X this-mo.X this-y.X risks-1.X regress-1.X \ -datevtime-1.X rfc822-1.X relative-1.X relative-2.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 \ +maint_gen = 1.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-0a.X utc-1.I utc-1.X utc-1a.I \ +utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X this-m.X \ +this-h.X this-w.X this-mo.X this-y.X risks-1.X regress-1.X datevtime-1.X \ +rfc822-1.X relative-1.X relative-2.X +run_gen = 1.O 1.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 \ V92-3.O V92-3.E W92-1.O W92-1.E W92-2.O W92-2.E W92-3.O W92-3.E millen-1.O \ millen-1.E rel-0.O rel-0.E rel-1a.O rel-1a.E rel-1b.O rel-1b.E rel-2a.O \ diff --git a/tests/date/date-tests b/tests/date/date-tests index d01de3a37..28a37ca43 100755 --- a/tests/date/date-tests +++ b/tests/date/date-tests @@ -36,24 +36,6 @@ else esac fi test -s 1.E || rm -f 1.E -LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%c' > 2.O 2> 2.E -code=$? -if test $code != 0; then - $echo "Test 2(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2 - errors=`expr $errors + 1` -else - cmp 2.O $srcdir/2.X > /dev/null 2>&1 - case $? in - 0) if test "$VERBOSE"; then $echo "passed 2(LANG=C TZ=UTC0)"; fi;; - 1) $echo "Test 2(LANG=C TZ=UTC0) failed: files 2.O and $srcdir/2.X differ" 1>&2 - (diff -c 2.O $srcdir/2.X) 2> /dev/null - errors=`expr $errors + 1`;; - 2) $echo "Test 2(LANG=C TZ=UTC0) may have failed." 1>&2 - $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 - errors=`expr $errors + 1`;; - esac -fi -test -s 2.E || rm -f 2.E LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%d_%D_%e_%h_%H' > 3.O 2> 3.E code=$? if test $code != 0; then @@ -1099,7 +1081,7 @@ else fi test -s relative-2.E || rm -f relative-2.E if test $errors = 0; then - $echo Passed all 60 tests. 1>&2 + $echo Passed all 59 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi |