naruse	2012-05-14 13:18:05 +0900 (Mon, 14 May 2012)

  New Revision: 35642

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

  Log:
    merge revision(s) 35631:
    
    * test/ruby/test_io.rb (class TestIO):  Disable GC during IO tests to
      avoid file descriptors being GC'ed. Suggestion by Tomoyuki Chikanaga
      [ruby-core:43951][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 35641)
+++ ruby_1_9_3/ChangeLog	(revision 35642)
@@ -1,3 +1,9 @@
+Mon May 14 13:17:57 2012  Luis Lavena  <luislavena@g...>
+
+	* test/ruby/test_io.rb (class TestIO):  Disable GC during IO tests to
+	  avoid file descriptors being GC'ed. Suggestion by Tomoyuki Chikanaga
+	  [ruby-core:43951][Bug #6228]
+
 Fri May 11 14:09:48 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35641)
+++ ruby_1_9_3/version.h	(revision 35642)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
 
-#define RUBY_RELEASE_DATE "2012-05-12"
+#define RUBY_RELEASE_DATE "2012-05-14"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/test_io.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_io.rb	(revision 35641)
+++ ruby_1_9_3/test/ruby/test_io.rb	(revision 35642)
@@ -10,6 +10,14 @@
 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?

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