aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/-ext-/time/test_new.rb4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 67005a1706..2db4a2736c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 17 08:13:43 2016 Rei Odaira <Rei.Odaira@gmail.com>
+
+ * test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values
+ are the same only when both or neither of the Time objects are in
+ summer time (daylight-saving time).
+
Thu Mar 17 07:17:36 2016 Eric Hodel <drbrain@segment7.net>
* marshal.c (r_object0): raise ArgumentError when linking to undefined
diff --git a/test/-ext-/time/test_new.rb b/test/-ext-/time/test_new.rb
index 699201fda5..67f5328819 100644
--- a/test/-ext-/time/test_new.rb
+++ b/test/-ext-/time/test_new.rb
@@ -23,7 +23,9 @@ class Bug::Time::Test_New < Test::Unit::TestCase
assert_equal(false, Bug::Time.timespec_new(1447087832, 476451125, 0).utc?)
assert_equal(true, Bug::Time.timespec_new(1447087832, 476451125, 0x7ffffffe).utc?)
assert_equal(false, Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).utc?)
- assert_equal(Time.now.gmtoff, Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).gmtoff)
+ if Time.now.isdst == Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).isdst
+ assert_equal(Time.now.gmtoff, Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).gmtoff)
+ end
assert_time_equal(Time.at(1447087832, 476451.125).localtime(86399),
Bug::Time.timespec_new(1447087832, 476451125, 86399))
assert_time_equal(Time.at(1447087832, 476451.125).localtime(-86399),