diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 03:00:00 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 03:00:00 +0000 |
commit | e00d0451d02ac5800fda83e377464551abb7f084 (patch) | |
tree | 6c8d957442a7c42a132867340e3e26752d27c279 | |
parent | 9c81308bf7d5a966dae195cd59ca7d15d01d6018 (diff) |
* test/ruby/test_time.rb: fixed merge misstake in r40711 and r40719.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_time.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index d6ce30498f..03172149ea 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -14,6 +14,11 @@ class TestTime < Test::Unit::TestCase $VERBOSE = @verbose end + def no_leap_seconds? + # 1972-06-30T23:59:60Z is the first leap second. + Time.utc(1972, 7, 1, 0, 0, 0) - Time.utc(1972, 6, 30, 23, 59, 59) == 1 + end + def get_t2000 if no_leap_seconds? # Sat Jan 01 00:00:00 UTC 2000 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 423 +#define RUBY_PATCHLEVEL 424 #define RUBY_RELEASE_DATE "2013-05-14" #define RUBY_RELEASE_YEAR 2013 |