nagachika	2015-11-28 05:49:20 +0900 (Sat, 28 Nov 2015)

  New Revision: 52770

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

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_symbol.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52769)
+++ ruby_2_2/ChangeLog	(revision 52770)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Nov 28 05:47:27 2015  Rei Odaira  <Rei.Odaira@g...>
+
+	* 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@g...>
+
+	* test/ruby/test_symbol.rb: avoid a false positive in AIX.
+
 Sat Nov 28 05:35:28 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/objspace/test_objspace.rb
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52769)
+++ ruby_2_2/version.h	(revision 52770)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/test/ruby/test_symbol.rb
===================================================================
--- ruby_2_2/test/ruby/test_symbol.rb	(revision 52769)
+++ ruby_2_2/test/ruby/test_symbol.rb	(revision 52770)
@@ -263,8 +263,8 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_symbol.rb#L263
   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
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49813,52140


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