summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-09 14:34:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-09 14:34:33 +0000
commit0c0496ebd2a61f1d9b115209b0aa314a9dee60a8 (patch)
tree485d584405c67327e2c8f29ec5696f67c001cb8b /test
parent29756c5e94c6f273c6b1a1103d9c0b12570566ea (diff)
envutil.rb: kill child
* test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill the child process certainly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/envutil.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 9e527e90b1..657e991e3f 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -44,6 +44,7 @@ module EnvUtil
err_p.set_encoding(enc) if err_p
end
timeout = opt.delete(:timeout) || 10
+ reprieve = opt.delete(:reprieve) || 1
c = "C"
child_env = {}
LANG_ENVS.each {|lc| child_env[lc] = c}
@@ -70,7 +71,9 @@ module EnvUtil
begin
Process.kill signal, pid
rescue Errno::ESRCH
- end
+ break
+ else
+ end until signal == :KILL or (sleep reprieve; signal = :KILL; false)
raise Timeout::Error
end
out_p.close if capture_stdout