* time/Makefile (tst-getdate-ENV): Add TZDIR to environment.

	* time/Depend: New, add dependency on timezone.

	* time/tst-getdate.c: Add testcase for bug report by Hendrik
	Uhlmann <HUhlmann@stn-atlas.de>.
	* time/datemsk: Likewise.

diff --git a/time/Depend b/time/Depend
new file mode 100644 (file)
index 0000000..79b2469
--- /dev/null
+++ b/time/Depend
@@ -0,0 +1 @@
+timezone

diff --git a/time/Makefile b/time/Makefile
index 67c1646..ae5c844 100644 (file)
--- 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 9ed24a4..3dc4d41 100644 (file)
--- 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 7e24d89..2518f8c 100644 (file)
--- 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)