aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--timezone/test-tz.c2
-rw-r--r--timezone/tst-timezone.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e79a2b8364..a7de34d482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07 Alexandre Oliva <aoliva@redhat.com>
+
+ * timezone/test-tz.c: Update to match tzdata2005m.
+ * timezone/tst-timezone.c: Likewise.
+
2005-09-07 Ulrich Drepper <drepper@redhat.com>
* posix/regexec.c (find_recover_state): Remove unnecessary
diff --git a/timezone/test-tz.c b/timezone/test-tz.c
index 642b45a0ed..55613654c7 100644
--- a/timezone/test-tz.c
+++ b/timezone/test-tz.c
@@ -7,7 +7,7 @@ struct {
const char * env;
time_t expected;
} tests[] = {
- {"MST", 832935315},
+ {"MST", 832910115},
{"", 832910115},
{":UTC", 832910115},
{"UTC", 832910115},
diff --git a/timezone/tst-timezone.c b/timezone/tst-timezone.c
index 127956de29..4c879163cf 100644
--- a/timezone/tst-timezone.c
+++ b/timezone/tst-timezone.c
@@ -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 }
};