Fix for timezone tests that regressed with tzdata2005m

Fix for timezone tests that regressed with tzdata2005m

[Alexandre Oliva]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

This patch gets the timezone/ tests to pass.  I haven't checked
whether the modified information is accurate, I just tweaked the tests
enough such that they'd pass, so use it with caution.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: glibc-timezone-2005m.patch --]
[-- Type: text/x-patch, Size: 1801 bytes --]

Index: ChangeLog
2005-09-07  Alexandre Oliva  <aoliva@redhat.com>

	* timezone/test-tz.c: Update to match tzdata2005m.
	* timezone/tst-timezone.c: Likewise.

Index: timezone/test-tz.c
===================================================================
RCS file: /cvs/glibc/libc/timezone/test-tz.c,v
retrieving revision 1.5
diff -u -p -r1.5 test-tz.c
--- timezone/test-tz.c 31 Dec 2000 10:52:32 -0000 1.5
+++ timezone/test-tz.c 7 Sep 2005 19:18:38 -0000
@@ -7,7 +7,7 @@ struct {
   const char *	env;
   time_t	expected;
 } tests[] = {
-  {"MST",	832935315},
+  {"MST",	832910115},
   {"",		832910115},
   {":UTC",	832910115},
   {"UTC",	832910115},
Index: timezone/tst-timezone.c
===================================================================
RCS file: /cvs/glibc/libc/timezone/tst-timezone.c,v
retrieving revision 1.12
diff -u -p -r1.12 tst-timezone.c
--- timezone/tst-timezone.c 6 Jul 2001 04:56:24 -0000 1.12
+++ timezone/tst-timezone.c 7 Sep 2005 19:18:38 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1998.
 
@@ -42,9 +42,9 @@ static const struct test_times tests[] =
   { "Australia/Melbourne", 1, -36000, { "EST", "EST" }},
   { "America/Sao_Paulo", 1, 10800, {"BRT", "BRST" }},
   { "America/Chicago", 1, 21600, {"CST", "CDT" }},
-  { "America/Indianapolis", 1, 18000, {"EST", "EDT" }},
+  { "America/Indiana/Indianapolis", 1, 18000, {"EST", "EDT" }},
   { "America/Los_Angeles", 1, 28800, {"PST", "PDT" }},
-  { "Asia/Tokyo", 0, -32400, {"JST", "JST" }},
+  { "Asia/Tokyo", 1, -32400, {"JST", "JDT" }},
   { "Pacific/Auckland", 1, -43200, { "NZST", "NZDT" }},
   { NULL, 0, 0 }
 };

[-- Attachment #3: Type: text/plain, Size: 188 bytes --]


-- 
Alexandre Oliva         http://www.lsd.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer   aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist  oliva@{lsd.ic.unicamp.br, gnu.org}

Re: Fix for timezone tests that regressed with tzdata2005m

[Ulrich Drepper]

[-- Attachment #1: Type: text/plain, Size: 101 bytes --]

Applied.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]