@@ -86,7 +86,9 @@ def group_by(e, &block)
8686 has_lisbon_tz &&= have_tz_offset? ( "Europe/Lisbon" )
8787 CORRECT_TOKYO_DST_1951 = with_tz ( "Asia/Tokyo" ) {
8888 if Time . local ( 1951 , 5 , 6 , 12 , 0 , 0 ) . dst? # noon, DST
89- Time . local ( 1951 , 5 , 6 , 1 , 0 , 0 ) . dst? # DST with fixed tzdata
89+ if Time . local ( 1951 , 5 , 6 , 1 , 0 , 0 ) . dst? # DST with fixed tzdata
90+ Time . local ( 1951 , 9 , 8 , 23 , 0 , 0 ) . dst? ? "2018f" : "2018e"
91+ end
9092 end
9193 }
9294 CORRECT_KIRITIMATI_SKIP_1994 = with_tz ( "Pacific/Kiritimati" ) {
@@ -347,12 +349,16 @@ def self.gen_zdump_test(data)
347349Asia/Singapore Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000
348350Asia/Singapore Thu Dec 31 16:30:00 1981 UTC = Fri Jan 1 00:30:00 1982 SGT isdst=0 gmtoff=28800
349351End
350- gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' : <<'End'
352+ gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + ( CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f' ) : <<'End'
351353Asia/Tokyo Sat May 5 14:59:59 1951 UTC = Sat May 5 23:59:59 1951 JST isdst=0 gmtoff=32400
352354Asia/Tokyo Sat May 5 15:00:00 1951 UTC = Sun May 6 01:00:00 1951 JDT isdst=1 gmtoff=36000
355+ End
353356Asia/Tokyo Sat Sep 8 13:59:59 1951 UTC = Sat Sep 8 23:59:59 1951 JDT isdst=1 gmtoff=36000
354357Asia/Tokyo Sat Sep 8 14:00:00 1951 UTC = Sat Sep 8 23:00:00 1951 JST isdst=0 gmtoff=32400
355- End
358+ 2018e
359+ Asia/Tokyo Sat Sep 8 14:59:59 1951 UTC = Sun Sep 9 00:59:59 1951 JDT isdst=1 gmtoff=36000
360+ Asia/Tokyo Sat Sep 8 15:00:00 1951 UTC = Sun Sep 9 00:00:00 1951 JST isdst=0 gmtoff=32400
361+ 2018f
356362Asia/Tokyo Sat May 5 16:59:59 1951 UTC = Sun May 6 01:59:59 1951 JST isdst=0 gmtoff=32400
357363Asia/Tokyo Sat May 5 17:00:00 1951 UTC = Sun May 6 03:00:00 1951 JDT isdst=1 gmtoff=36000
358364Asia/Tokyo Fri Sep 7 15:59:59 1951 UTC = Sat Sep 8 01:59:59 1951 JDT isdst=1 gmtoff=36000
0 commit comments