diff options
Diffstat (limited to 'timezone')
| -rw-r--r-- | timezone/Makefile | 7 | ||||
| -rw-r--r-- | timezone/tst-timezone.c | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/timezone/Makefile b/timezone/Makefile index e5cd8e2734..7743b94695 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -180,7 +180,8 @@ $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC) $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ Europe/Berlin Universal \ Australia/Melbourne \ - America/Sao_Paulo Asia/Tokyo GB) + America/Sao_Paulo Asia/Tokyo \ + Europe/London) test-tz-ENV = TZDIR=$(testdata) tst-timezone-ENV = TZDIR=$(testdata) @@ -206,7 +207,7 @@ $(testdata)/America/Sao_Paulo: southamerica $(objpfx)zic $(leapseconds) \ $(build-testdata) $(testdata)/Asia/Tokyo: asia $(objpfx)zic $(leapseconds) yearistype $(build-testdata) -$(testdata)/GB: europe $(objpfx)zic $(leapseconds) yearistype +$(testdata)/Europe/London: europe $(objpfx)zic $(leapseconds) yearistype $(build-testdata) diff --git a/timezone/tst-timezone.c b/timezone/tst-timezone.c index 94b9d2d72e..5588faaea4 100644 --- a/timezone/tst-timezone.c +++ b/timezone/tst-timezone.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1998. @@ -114,13 +114,12 @@ main (int argc, char ** argv) check_tzvars (pt->name, pt->daylight, pt->timezone, pt->tzname); } -#if 0 - /* From a port of Scott Harrington <seh4@ix.netcom.com> to the timezone + /* From a post of Scott Harrington <seh4@ix.netcom.com> to the timezone mailing list. */ { struct tm tmBuf = {0, 0, 0, 10, 3, 98, 0, 0, -1}; char buf[200]; - putenv ("TZ=GB"); + putenv ("TZ=Europe/London"); t = mktime (&tmBuf); snprintf (buf, sizeof (buf), "TZ=%s %ld %d %d %d %d %d %d %d %d %d", getenv ("TZ"), t, @@ -129,8 +128,8 @@ main (int argc, char ** argv) tmBuf.tm_wday, tmBuf.tm_yday, tmBuf.tm_isdst); fputs (buf, stdout); puts (" should be"); - puts ("TZ=GB 892162800 0 0 0 10 3 98 5 99 1"); - failed |= strcmp (buf, "TZ=GB 892162800 0 0 0 10 3 98 5 99 1") != 0; + puts ("TZ=Europe/London 892162800 0 0 0 10 3 98 5 99 1"); + failed |= strcmp (buf, "TZ=Europe/London 892162800 0 0 0 10 3 98 5 99 1") != 0; } printf("\n"); @@ -150,7 +149,6 @@ main (int argc, char ** argv) puts ("TZ=GMT 892166400 0 0 0 10 3 98 5 99 0"); failed |= strcmp (buf, "TZ=GMT 892166400 0 0 0 10 3 98 5 99 0") != 0; } -#endif return failed ? EXIT_FAILURE : EXIT_SUCCESS; } |