summaryrefslogtreecommitdiff
path: root/test/testunit/test_parallel.rb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-30 03:56:34 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-30 03:56:34 +0000
commitdc1ecab0845ef3a3edfa02b961ea8283ee82ea82 (patch)
tree90579df62fea8c4cd4ded4cc91482d8740e68193 /test/testunit/test_parallel.rb
parenteb38fb670bb74522f253cca440bccfd8d8d63c3c (diff)
test/testunit/test_parallel.rb: respect subprocess timeout scale
MJIT tests take longer than 100s on my VM :< git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/testunit/test_parallel.rb')
-rw-r--r--test/testunit/test_parallel.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index b11330b..2e5ad86 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -5,7 +5,8 @@ require 'timeout'
module TestParallel
PARALLEL_RB = "#{File.dirname(__FILE__)}/../lib/test/unit/parallel.rb"
TESTS = "#{File.dirname(__FILE__)}/tests_for_parallel"
- TIMEOUT = RubyVM::MJIT.enabled? ? 100 : 10 # use large timeout for --jit-wait
+ # use large timeout for --jit-wait
+ TIMEOUT = EnvUtil.apply_timeout_scale(RubyVM::MJIT.enabled? ? 100 : 10)
class TestParallelWorker < Test::Unit::TestCase
def setup