nagachika	2013-12-21 22:49:33 +0900 (Sat, 21 Dec 2013)

  New Revision: 44322

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

  Log:
    merge revision(s) 44000: [Backport #9205]
    
    test_gc.rb: shorten
    
    * test/ruby/test_gc.rb (test_sweep_in_finalizer): omit iteration number to 2.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_gc.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44321)
+++ ruby_2_0_0/version.h	(revision 44322)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-12-21"
-#define RUBY_PATCHLEVEL 365
+#define RUBY_PATCHLEVEL 366
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_0_0/test/ruby/test_gc.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_gc.rb	(revision 44321)
+++ ruby_2_0_0/test/ruby/test_gc.rb	(revision 44322)
@@ -163,7 +163,7 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_gc.rb#L163
 
   def test_sweep_in_finalizer
     bug9205 = '[ruby-core:58833] [Bug #9205]'
-    100.times do
+    2.times do
       assert_ruby_status([], <<-'end;', bug9205)
         raise_proc = proc do |id|
           GC.start

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44000


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