naruse	2012-05-14 17:14:37 +0900 (Mon, 14 May 2012)

  New Revision: 35646

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

  Log:
    merge revision(s) 35636,35637: [Backport #6429]
    
    * test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
      test_flush_in_finalizer1.  [ruby-core:43951] [Bug ##6228]
    
    * test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
      to close IO objects. it create IO object with already closed fd, and
      cause occasional Errno::EBADF in following tests. [ruby-core:45020]
      [Bug #6228]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_io.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35645)
+++ ruby_1_9_3/ChangeLog	(revision 35646)
@@ -1,3 +1,15 @@
+Mon May 14 17:14:10 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
+	  to close IO objects. it create IO object with already closed fd, and
+	  cause occasional Errno::EBADF in following tests. [ruby-core:45020]
+	  [Bug #6228]
+
+Mon May 14 17:14:10 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
+	  test_flush_in_finalizer1.  [ruby-core:43951] [Bug ##6228]
+
 Mon May 14 13:18:56 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_tokadd_string): insert a backslash only if
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35645)
+++ ruby_1_9_3/version.h	(revision 35646)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
 
 #define RUBY_RELEASE_DATE "2012-05-14"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_io.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_io.rb	(revision 35645)
+++ ruby_1_9_3/test/ruby/test_io.rb	(revision 35646)
@@ -10,14 +10,6 @@
 require_relative 'envutil'
 
 class TestIO < Test::Unit::TestCase
-  def setup
-    GC.disable
-  end
-
-  def teardown
-    GC.enable
-  end
-
   def have_close_on_exec?
     begin
       $stdin.close_on_exec?
@@ -1807,7 +1799,7 @@
       }
     end
   ensure
-    fds.each {|fd| IO.for_fd(fd).close rescue next}
+    GC.start
   end
 
   def test_flush_in_finalizer2

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