diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_process.rb | 101 |
2 files changed, 58 insertions, 48 deletions
@@ -1,3 +1,8 @@ +Sun Nov 30 17:11:05 2014 Tanaka Akira <akr@fsij.org> + + * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use + assert_separately. + Sun Nov 30 00:02:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (process_options, ruby_script): transcode script name and diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 15a83a33ba..4f67cf36fd 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1918,59 +1918,64 @@ EOS end def test_deadlock_by_signal_at_forking - GC.start # reduce garbage - buf = '' - ruby = EnvUtil.rubybin - er, ew = IO.pipe - unless runner = IO.popen("-".freeze) - er.close - status = true - GC.disable # avoid triggering CoW after forks + assert_separately([], <<-INPUT) + require 'io/wait' begin - $stderr.reopen($stdout) - trap(:QUIT) {} - parent = $$ - 100.times do |i| - pid = fork {Process.kill(:QUIT, parent)} - IO.popen(ruby, 'r+'.freeze){} - Process.wait(pid) - $stdout.puts - $stdout.flush + GC.start # reduce garbage + buf = '' + ruby = EnvUtil.rubybin + er, ew = IO.pipe + unless runner = IO.popen("-".freeze) + er.close + status = true + GC.disable # avoid triggering CoW after forks + begin + $stderr.reopen($stdout) + trap(:QUIT) {} + parent = $$ + 100.times do |i| + pid = fork {Process.kill(:QUIT, parent)} + IO.popen(ruby, 'r+'.freeze){} + Process.wait(pid) + $stdout.puts + $stdout.flush + end + ensure + if $! + ew.puts([Marshal.dump($!)].pack("m0")) + status = false + end + ew.close + exit!(status) + end + end + ew.close + begin + loop do + runner.wait_readable(5) + runner.read_nonblock(100, buf) + end + rescue EOFError => e + _, status = Process.wait2(runner.pid) + rescue IO::WaitReadable => e + Process.kill(:INT, runner.pid) + raise Marshal.load(er.read.unpack("m")[0]) end + assert_predicate(status, :success?) ensure - if $! - ew.puts([Marshal.dump($!)].pack("m0")) - status = false + er.close unless er.closed? + ew.close unless ew.closed? + if runner + begin + Process.kill(:TERM, runner.pid) + sleep 1 + Process.kill(:KILL, runner.pid) + rescue Errno::ESRCH + end + runner.close end - ew.close - exit!(status) - end - end - ew.close - begin - loop do - runner.wait_readable(5) - runner.read_nonblock(100, buf) end - rescue EOFError => e - _, status = Process.wait2(runner.pid) - rescue IO::WaitReadable => e - Process.kill(:INT, runner.pid) - raise Marshal.load(er.read.unpack("m")[0]) - end - assert_predicate(status, :success?) - ensure - er.close unless er.closed? - ew.close unless ew.closed? - if runner - begin - Process.kill(:TERM, runner.pid) - sleep 1 - Process.kill(:KILL, runner.pid) - rescue Errno::ESRCH - end - runner.close - end + INPUT end if defined?(fork) def test_process_detach |