From e2aeaed63382217d3c1591a74fa68435173fd7fd Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 14 May 2012 08:14:37 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ test/ruby/test_io.rb | 10 +--------- version.h | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf9d2b7fc9..fbaf7d029a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon May 14 17:14:10 2012 CHIKANAGA Tomoyuki + + * 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 + + * 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 * parse.y (parser_tokadd_string): insert a backslash only if diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 84a147aa06..36dab0815d 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -10,14 +10,6 @@ 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? @@ -1807,7 +1799,7 @@ End } end ensure - fds.each {|fd| IO.for_fd(fd).close rescue next} + GC.start end def test_flush_in_finalizer2 diff --git a/version.h b/version.h index 602a5dba29..9b43ff9c36 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3