ruby-changes:28667
From: usa <ko1@a...>
Date: Tue, 14 May 2013 11:58:58 +0900 (JST)
Subject: [ruby-changes:28667] usa:r40719 (ruby_1_9_3): * test/ruby/test_time.rb: fixed merge misstake in r40711.
usa 2013-05-14 11:58:23 +0900 (Tue, 14 May 2013) New Revision: 40719 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40719 Log: * test/ruby/test_time.rb: fixed merge misstake in r40711. Modified files: branches/ruby_1_9_3/test/ruby/test_time.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 40718) +++ ruby_1_9_3/version.h (revision 40719) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 422 +#define RUBY_PATCHLEVEL 423 #define RUBY_RELEASE_DATE "2013-05-14" #define RUBY_RELEASE_YEAR 2013 Index: ruby_1_9_3/test/ruby/test_time.rb =================================================================== --- ruby_1_9_3/test/ruby/test_time.rb (revision 40718) +++ ruby_1_9_3/test/ruby/test_time.rb (revision 40719) @@ -14,6 +14,15 @@ class TestTime < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ruby/test_time.rb#L14 $VERBOSE = @verbose end + def get_t2000 + if no_leap_seconds? + # Sat Jan 01 00:00:00 UTC 2000 + Time.at(946684800).gmtime + else + Time.utc(2000, 1, 1) + end + end + def test_new assert_equal(Time.utc(2000,2,10), Time.new(2000,2,10, 11,0,0, 3600*11)) assert_equal(Time.utc(2000,2,10), Time.new(2000,2,9, 13,0,0, -3600*11)) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/