summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-31 14:21:59 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-31 14:21:59 +0000
commit8b310ae75dc6b189e25909c6bf96a6f575382088 (patch)
treeae44ea38b25a9f868df102138dfc7f578523948b
parent9f86a43648d77414bc8509f03720a2aed334f62d (diff)
downloadruby-8b310ae75dc6b189e25909c6bf96a6f575382088.tar.gz
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_gc.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 5b85d3d8d9..d59451a025 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -290,7 +290,7 @@ class TestGc < Test::Unit::TestCase
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 = []
diff --git a/version.h b/version.h
index 2787b4e308..45b5e25a7d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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