naruse	2014-12-24 03:14:15 +0900 (Wed, 24 Dec 2014)

  New Revision: 48949

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

  Log:
    merge revision(s) 48900,48902: [Backport #10618]
    
    test/test_weakref.rb: increase timeout [Bug #10618]
    
    * test/test_weakref.rb (test_repeated_object_leak): increase timeout
      [Bug #10618]
    * test/test_weakref.rb (test_repeated_object_leak): increase timeout
      [Bug #10618]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/test_weakref.rb
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 48948)
+++ ruby_2_2/ChangeLog	(revision 48949)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec 24 03:12:28 2014  Eric Wong  <e@8...>
+
+	* test/test_weakref.rb (test_repeated_object_leak): increase timeout
+	  [Bug #10618]
+
 Wed Dec 24 02:22:11 2014  Tanaka Akira  <akr@f...>
 
 	* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.
Index: ruby_2_2/test/test_weakref.rb
===================================================================
--- ruby_2_2/test/test_weakref.rb	(revision 48948)
+++ ruby_2_2/test/test_weakref.rb	(revision 48949)
@@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/test_weakref.rb#L63
 
   def test_repeated_object_leak
     bug10537 = '[ruby-core:66428]'
-    assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537)
+    assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 60)
       a = Object.new
       150_000.times { WeakRef.new(a) }
     end;

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48900,48902


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