nagachika	2014-05-08 00:49:11 +0900 (Thu, 08 May 2014)

  New Revision: 45866

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

  Log:
    merge revision(s) r44619:
    
    test_gc.rb: relax assertion
    
    * test/ruby/test_gc.rb (test_profiler_total_time): GC time may be
      shorter than the timer resolution.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/ruby/test_gc.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45865)
+++ ruby_2_1/version.h	(revision 45866)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-06"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_RELEASE_DATE "2014-05-08"
+#define RUBY_PATCHLEVEL 94
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/ruby/test_gc.rb
===================================================================
--- ruby_2_1/test/ruby/test_gc.rb	(revision 45865)
+++ ruby_2_1/test/ruby/test_gc.rb	(revision 45866)
@@ -244,7 +244,7 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_gc.rb#L244
     GC::Profiler.clear
 
     GC.start
-    assert_operator(GC::Profiler.total_time, :>, 0)
+    assert_operator(GC::Profiler.total_time, :>=, 0)
   ensure
     GC::Profiler.disable
   end

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44619


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