From a6eea9be6e27ab951c0aed1e2338ae73b151035f Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 27 Nov 2015 20:49:20 +0000 Subject: [PATCH] merge revision(s) 49813,52140: [Backport #10686] * test/ruby/test_symbol.rb: avoid a false positive in AIX. * test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up code and check RSS to avoid false positive on AIX and false negative on Mac OS X. [Bug #10686] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ test/ruby/test_symbol.rb | 4 ++-- version.h | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b94260b2c..29340bfe73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sat Nov 28 05:47:27 2015 Rei Odaira + + * test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up + code and check RSS to avoid false positive on AIX and false + negative on Mac OS X. [Bug #10686] + +Sat Nov 28 05:47:27 2015 Rei Odaira + + * test/ruby/test_symbol.rb: avoid a false positive in AIX. + Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki * test/objspace/test_objspace.rb diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index ee29cd544f..f94b519fe7 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -263,8 +263,8 @@ class TestSymbol < Test::Unit::TestCase def test_symbol_fstr_leak bug10686 = '[ruby-core:67268] [Bug #10686]' x = 0 - assert_no_memory_leak([], '', <<-"end;", bug10686, limit: 1.65) - 200_000.times { |i| i.to_s.to_sym } + assert_no_memory_leak([], '200_000.times { |i| i.to_s.to_sym }; GC.start', <<-"end;", bug10686, limit: 1.71, rss: true) + 200_000.times { |i| (i + 200_000).to_s.to_sym } end; end diff --git a/version.h b/version.h index 9b9aa490d0..5aa0493ce2 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-11-28" -#define RUBY_PATCHLEVEL 202 +#define RUBY_PATCHLEVEL 203 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11