archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 49813,52140: [Backport #10686]

Browse source 
* 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
This commit is contained in:
nagachika 2015-11-27 20:49:20 +00:00
parent b908b2d69e
commit a6eea9be6e
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Sat Nov 28 05:47:27 2015 Rei Odaira <Rei.Odaira@gmail.com>
* 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 <Rei.Odaira@gmail.com>
* test/ruby/test_symbol.rb: avoid a false positive in AIX.
Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* test/objspace/test_objspace.rb * test/objspace/test_objspace.rb

4
test/ruby/test_symbol.rb
View file

@ -263,8 +263,8 @@ class TestSymbol < Test::Unit::TestCase
def test_symbol_fstr_leak def test_symbol_fstr_leak
bug10686 = '[ruby-core:67268] [Bug #10686]' bug10686 = '[ruby-core:67268] [Bug #10686]'
x = 0 x = 0
assert_no_memory_leak([], '', <<-"end;", bug10686, limit: 1.65) 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.to_s.to_sym } 200_000.times { |i| (i + 200_000).to_s.to_sym }
end; end;
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-11-28" #define RUBY_RELEASE_DATE "2015-11-28"
#define RUBY_PATCHLEVEL 202 #define RUBY_PATCHLEVEL 203
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11