envutil.rb: reap zombies
* test/ruby/envutil.rb (EnvUtil#invoke_ruby): reap zombies. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
058e6894bf
commit
c4561c2934
@ -68,10 +68,17 @@ module EnvUtil
|
|||||||
signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
|
signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
|
||||||
begin
|
begin
|
||||||
Process.kill signal, pid
|
Process.kill signal, pid
|
||||||
|
Timeout.timeout((reprieve unless signal == :KILL)) do
|
||||||
|
Process.wait(pid)
|
||||||
|
end
|
||||||
rescue Errno::ESRCH
|
rescue Errno::ESRCH
|
||||||
break
|
break
|
||||||
|
rescue Timeout::Error
|
||||||
|
raise if signal == :KILL
|
||||||
|
signal = :KILL
|
||||||
else
|
else
|
||||||
end until signal == :KILL or (sleep reprieve; signal = :KILL; false)
|
break
|
||||||
|
end while true
|
||||||
raise Timeout::Error
|
raise Timeout::Error
|
||||||
end
|
end
|
||||||
out_p.close if capture_stdout
|
out_p.close if capture_stdout
|
||||||
|
Loading…
x
Reference in New Issue
Block a user