summaryrefslogtreecommitdiff
path: root/test/lib/envutil.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-24 00:51:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-24 00:51:01 +0000
commit52acc428f0d455bcbb2733f9ae0c83db180f8a1e (patch)
tree08bd87c010886ee6716dfe5a6b6d08a705b6155d /test/lib/envutil.rb
parent642b3a260bda7e4b8380bcc797efce547879295e (diff)
test/unit.rb: --subprocess-timeout-scale option
* test/lib/envutil.rb (EnvUtil#invoke_ruby): add subprocess timeout scaling factor. * test/lib/test/unit.rb (Test::Unit::SubprocessOption): add --subprocess-timeout-scale option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib/envutil.rb')
-rw-r--r--test/lib/envutil.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index 04fdc8d30f..89721754a2 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -40,12 +40,20 @@ module EnvUtil
DEFAULT_SIGNALS = Signal.list
DEFAULT_SIGNALS.delete("TERM") if /mswin|mingw/ =~ RUBY_PLATFORM
+ class << self
+ attr_accessor :subprocess_timeout_scale
+ end
+
def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr = false,
encoding: nil, timeout: 10, reprieve: 1, timeout_error: Timeout::Error,
stdout_filter: nil, stderr_filter: nil,
signal: :TERM,
rubybin: EnvUtil.rubybin,
**opt)
+ if scale = EnvUtil.subprocess_timeout_scale
+ timeout *= scale if timeout
+ reprieve *= scale if reprieve
+ end
in_c, in_p = IO.pipe
out_p, out_c = IO.pipe if capture_stdout
err_p, err_c = IO.pipe if capture_stderr && capture_stderr != :merge_to_stdout