|
 |
0ab684 |
From e71ca6cdcf108e6a2fa47ec9fadefe7554717908 Mon Sep 17 00:00:00 2001
|
|
|
0ab684 |
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
|
|
0ab684 |
Date: Fri, 26 Oct 2018 01:47:09 +0000
|
|
|
0ab684 |
Subject: [PATCH] Update for tzdata-2018f
|
|
|
0ab684 |
|
|
|
0ab684 |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
|
|
0ab684 |
---
|
|
|
0ab684 |
test/ruby/test_time_tz.rb | 12 +++++++++---
|
|
|
0ab684 |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
0ab684 |
|
|
|
0ab684 |
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
|
|
|
0ab684 |
index 2da4fd8d9ce4..328fde48fc34 100644
|
|
|
0ab684 |
--- a/test/ruby/test_time_tz.rb
|
|
|
0ab684 |
+++ b/test/ruby/test_time_tz.rb
|
|
|
0ab684 |
@@ -86,7 +86,9 @@ def group_by(e, &block)
|
|
|
0ab684 |
has_lisbon_tz &&= have_tz_offset?("Europe/Lisbon")
|
|
|
0ab684 |
CORRECT_TOKYO_DST_1951 = with_tz("Asia/Tokyo") {
|
|
|
0ab684 |
if Time.local(1951, 5, 6, 12, 0, 0).dst? # noon, DST
|
|
|
0ab684 |
- Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata
|
|
|
0ab684 |
+ if Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata
|
|
|
0ab684 |
+ Time.local(1951, 9, 8, 23, 0, 0).dst? ? "2018f" : "2018e"
|
|
|
0ab684 |
+ end
|
|
|
0ab684 |
end
|
|
|
0ab684 |
}
|
|
|
0ab684 |
CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {
|
|
|
0ab684 |
@@ -347,12 +349,16 @@ def self.gen_zdump_test(data)
|
|
|
0ab684 |
Asia/Singapore Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000
|
|
|
0ab684 |
Asia/Singapore Thu Dec 31 16:30:00 1981 UTC = Fri Jan 1 00:30:00 1982 SGT isdst=0 gmtoff=28800
|
|
|
0ab684 |
End
|
|
|
0ab684 |
- gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' : <<'End'
|
|
|
0ab684 |
+ gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End'
|
|
|
0ab684 |
Asia/Tokyo Sat May 5 14:59:59 1951 UTC = Sat May 5 23:59:59 1951 JST isdst=0 gmtoff=32400
|
|
|
0ab684 |
Asia/Tokyo Sat May 5 15:00:00 1951 UTC = Sun May 6 01:00:00 1951 JDT isdst=1 gmtoff=36000
|
|
|
0ab684 |
+End
|
|
|
0ab684 |
Asia/Tokyo Sat Sep 8 13:59:59 1951 UTC = Sat Sep 8 23:59:59 1951 JDT isdst=1 gmtoff=36000
|
|
|
0ab684 |
Asia/Tokyo Sat Sep 8 14:00:00 1951 UTC = Sat Sep 8 23:00:00 1951 JST isdst=0 gmtoff=32400
|
|
|
0ab684 |
-End
|
|
|
0ab684 |
+2018e
|
|
|
0ab684 |
+Asia/Tokyo Sat Sep 8 14:59:59 1951 UTC = Sun Sep 9 00:59:59 1951 JDT isdst=1 gmtoff=36000
|
|
|
0ab684 |
+Asia/Tokyo Sat Sep 8 15:00:00 1951 UTC = Sun Sep 9 00:00:00 1951 JST isdst=0 gmtoff=32400
|
|
|
0ab684 |
+2018f
|
|
|
0ab684 |
Asia/Tokyo Sat May 5 16:59:59 1951 UTC = Sun May 6 01:59:59 1951 JST isdst=0 gmtoff=32400
|
|
|
0ab684 |
Asia/Tokyo Sat May 5 17:00:00 1951 UTC = Sun May 6 03:00:00 1951 JDT isdst=1 gmtoff=36000
|
|
|
0ab684 |
Asia/Tokyo Fri Sep 7 15:59:59 1951 UTC = Sat Sep 8 01:59:59 1951 JDT isdst=1 gmtoff=36000
|