This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: problem with getdate
Ulrich Drepper <drepper@redhat.com> writes:
> Andreas Jaeger <aj@suse.de> writes:
>
>> Ok to commit?
>
> No. This test depends on the timezone data. You have to add more
> changes to ensure that the timezone data is built before the test.
Here're the changes, they passed make check.
Ok now?
Andreas
2001-07-18 Andreas Jaeger <aj@suse.de>
* 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.
============================================================
Index: time/Makefile
--- time/Makefile 2001/07/06 04:56:23 1.95
+++ time/Makefile 2001/07/18 08:12:15
@@ -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
============================================================
Index: time/tst-getdate.c
--- time/tst-getdate.c 2001/07/06 04:56:23 1.6
+++ time/tst-getdate.c 2001/07/18 08:12:15
@@ -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)
============================================================
Index: time/datemsk
--- time/datemsk 2000/03/03 19:46:05 1.1
+++ time/datemsk 2001/07/18 08:12:15
@@ -1 +1,2 @@
%H:%M:%S %F
+%d-%m-%Y %T
============================================================
Index: time/Depend
--- time/Depend created
+++ time/Depend Wed Jul 18 10:09:08 2001 1.1
@@ -0,0 +1 @@
+timezone
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj