naruse	2015-02-06 12:06:04 +0900 (Fri, 06 Feb 2015)

  New Revision: 49523

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

  Log:
    merge revision(s) 49180: [Backport #10794]
    
    * test/ruby/test_symbol.rb (TestSymbol#test_symbol_fstr_leak): get rid of a
      false positive on mswin CI.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/ruby/test_symbol.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49522)
+++ ruby_2_2/version.h	(revision 49523)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-06"
-#define RUBY_PATCHLEVEL 41
+#define RUBY_PATCHLEVEL 42
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_2/test/ruby/test_symbol.rb
===================================================================
--- ruby_2_2/test/ruby/test_symbol.rb	(revision 49522)
+++ ruby_2_2/test/ruby/test_symbol.rb	(revision 49523)
@@ -234,7 +234,7 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_symbol.rb#L234
   def test_symbol_fstr_leak
     bug10686 = '[ruby-core:67268] [Bug #10686]'
     x = 0
-    assert_no_memory_leak([], '', <<-"end;", bug10686)
+    assert_no_memory_leak([], '', <<-"end;", bug10686, limit: 1.65)
       200_000.times { |i| i.to_s.to_sym }
     end;
   end

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49180


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