nagachika	2013-06-18 04:01:16 +0900 (Tue, 18 Jun 2013)

  New Revision: 41366

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

  Log:
    merge revision(s) 40849:
    
    test_objectspace.rb: run test_each_object separately
    
    * test/ruby/test_objectspace.rb (TestObjectSpace#test_each_object):
      run separately.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_objectspace.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41365)
+++ ruby_2_0_0/version.h	(revision 41366)
@@ -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-06-18"
-#define RUBY_PATCHLEVEL 226
+#define RUBY_PATCHLEVEL 227
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_0_0/test/ruby/test_objectspace.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_objectspace.rb	(revision 41365)
+++ ruby_2_0_0/test/ruby/test_objectspace.rb	(revision 41366)
@@ -67,6 +67,7 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_objectspace.rb#L67
   end
 
   def test_each_object
+    assert_separately([], <<-End)
     GC.disable
     eval('begin; 1.times{}; rescue; ensure; end')
     arys = []
@@ -81,5 +82,6 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_objectspace.rb#L82
         # rescue "can't modify frozen File" error.
       end
     }
+    End
   end
 end

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


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