From bdc36b360ea093e51cae4f983752bf077982fde0 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 11 Jan 2019 01:18:59 +0000 Subject: Ensure to terminate the child git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_thread.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 51c0338595..f133126934 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -967,7 +967,12 @@ _eom pid = cpid t0 = Time.now.to_f Process.kill(:SIGINT, pid) - Timeout.timeout(10) { Process.wait(pid) } + begin + Timeout.timeout(10) { Process.wait(pid) } + rescue Timeout::Error + EnvUtil.terminate(pid) + raise + end t1 = Time.now.to_f [$?, t1 - t0, err_p.read] end -- cgit v1.2.3