diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Nov 30 18:55:32 2014 Tanaka Akira <akr@fsij.org> + + * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): + Don't raise Interrupt. + Sun Nov 30 17:11:05 2014 Tanaka Akira <akr@fsij.org> * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 4f67cf36fd..0a6317aa54 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1959,7 +1959,13 @@ EOS _, status = Process.wait2(runner.pid) rescue IO::WaitReadable => e Process.kill(:INT, runner.pid) - raise Marshal.load(er.read.unpack("m")[0]) + exc = Marshal.load(er.read.unpack("m")[0]) + if exc.kind_of? Interrupt + # Don't raise Interrupt. It aborts test-all. + flunk "timeout" + else + raise exc + end end assert_predicate(status, :success?) ensure |