usa	2013-05-14 12:00:00 +0900 (Tue, 14 May 2013)

  New Revision: 40720

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40720

  Log:
    * test/ruby/test_time.rb: fixed merge misstake in r40711 and r40719.

  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 40719)
+++ ruby_1_9_3/version.h	(revision 40720)
@@ -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 423
+#define RUBY_PATCHLEVEL 424
 
 #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 40719)
+++ ruby_1_9_3/test/ruby/test_time.rb	(revision 40720)
@@ -14,6 +14,11 @@ 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 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/