diff options
| -rw-r--r-- | time/Depend | 1 | ||||
| -rw-r--r-- | time/Makefile | 2 | ||||
| -rw-r--r-- | time/datemsk | 1 | ||||
| -rw-r--r-- | time/tst-getdate.c | 13 |
4 files changed, 11 insertions, 6 deletions
diff --git a/time/Depend b/time/Depend new file mode 100644 index 0000000000..79b246903c --- /dev/null +++ b/time/Depend @@ -0,0 +1 @@ +timezone diff --git a/time/Makefile b/time/Makefile index 67c1646b7f..ae5c844492 100644 --- a/time/Makefile +++ b/time/Makefile @@ -47,5 +47,5 @@ CFLAGS-tzset.c = $(tz-cflags) # Don't warn about Y2k problem in strftime format string. CFLAGS-test_time.c = -Wno-format -tst-getdate-ENV= DATEMSK=datemsk +tst-getdate-ENV= DATEMSK=datemsk TZDIR=${common-objpfx}timezone/testdata test_time-ARGS= EST5EDT CST diff --git a/time/datemsk b/time/datemsk index 9ed24a4b5e..3dc4d417fe 100644 --- a/time/datemsk +++ b/time/datemsk @@ -1 +1,2 @@ %H:%M:%S %F +%d-%m-%Y %T diff --git a/time/tst-getdate.c b/time/tst-getdate.c index 7e24d89603..2518f8c75b 100644 --- a/time/tst-getdate.c +++ b/time/tst-getdate.c @@ -1,5 +1,5 @@ /* Test for getdate. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>, 2000. @@ -26,13 +26,15 @@ static const struct { const char *str; + const char *tz; int err; struct tm tm; } tests [] = { - {"21:01:10 1999-1-31", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}}, - {"21:01:10 1999-2-28", 0, {10, 1, 21, 28, 1, 99, 0, 0, 0}}, - {"16:30:46 2000-2-29", 0, {46, 30,16, 29, 1, 100, 0, 0, 0}} + {"21:01:10 1999-1-31", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}}, + {"21:01:10 1999-2-28", "Universal", 0, {10, 1, 21, 28, 1, 99, 0, 0, 0}}, + {"16:30:46 2000-2-29", "Universal", 0, {46, 30,16, 29, 1, 100, 0, 0, 0}}, + {"01-08-2000 05:06:07", "Europe/Berlin", 0, {7, 6, 5, 1, 7, 100, 0, 0, 0}} }; static void @@ -78,10 +80,11 @@ main (void) int i; struct tm *tm; - setenv ("TZ", "Universal", 1); for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) { + setenv ("TZ", tests[i].tz, 1); + tm = getdate (tests[i].str); if (getdate_err != tests[i].err) |