usa	2018-07-31 23:21:59 +0900 (Tue, 31 Jul 2018)

  New Revision: 64149

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64149

  Log:
    merge revision(s) 60011:
    
    test_gc.rb: relax criterion
    
    * test/ruby/test_gc.rb (TestGc#test_expand_heap): relax the
      criterion and compare by epsilon.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/ruby/test_gc.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 64148)
+++ ruby_2_4/version.h	(revision 64149)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.5"
 #define RUBY_RELEASE_DATE "2018-07-31"
-#define RUBY_PATCHLEVEL 314
+#define RUBY_PATCHLEVEL 315
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_4/test/ruby/test_gc.rb
===================================================================
--- ruby_2_4/test/ruby/test_gc.rb	(revision 64148)
+++ ruby_2_4/test/ruby/test_gc.rb	(revision 64149)
@@ -290,7 +290,7 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_gc.rb#L290
     base_length = GC.stat[:heap_eden_pages]
     (base_length * 500).times{ 'a' }
     GC.start
-    assert_in_delta base_length, (v = GC.stat[:heap_eden_pages]), 2,
+    assert_in_epsilon base_length, (v = GC.stat[:heap_eden_pages]), 1/8r,
            "invalid heap expanding (base_length: #{base_length}, GC.stat[:heap_eden_pages]: #{v})"
 
     a = []
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 64148)
+++ ruby_2_4	(revision 64149)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r60011

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