From 26e1ebb15e9d8c0bd82b4d0d56f54aafc6a8600a Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 14 May 2012 04:18:05 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_io.rb | 8 ++++++++ version.h | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c64ff4353..86c9de5f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon May 14 13:17:57 2012 Luis Lavena + + * 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 * ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC, diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index edf449dd5c..84a147aa06 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -10,6 +10,14 @@ require 'weakref' 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? diff --git a/version.h b/version.h index 123e62c279..567c1abb57 100644 --- a/version.h +++ b/version.h @@ -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" -- cgit v1.2.3