summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-01 11:21:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-01 11:21:40 +0000
commite961fcd528df0e2b830c3af58619e907b4aebe52 (patch)
treedef309094ba801b53f78f651f45718f890e50c0f
parentee4cb17b98fa5efe9c81f08743f3c165dd677547 (diff)
envutil.rb: signal argument
* test/lib/envutil.rb (invoke_ruby): add optional keyword argument of signal to be sent to hung-up process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/lib/envutil.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index 1193a1a525..9fe804c66d 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -33,6 +33,7 @@ module EnvUtil
def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr = false,
encoding: nil, timeout: 10, reprieve: 1,
stdout_filter: nil, stderr_filter: nil,
+ signal: (/mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM),
rubybin: EnvUtil.rubybin,
**opt)
in_c, in_p = IO.pipe
@@ -67,7 +68,6 @@ module EnvUtil
stdout = th_stdout.value if capture_stdout
stderr = th_stderr.value if capture_stderr && capture_stderr != :merge_to_stdout
else
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
case pgroup = opt[:pgroup]
when 0, true
pgroup = -pid