From dc1ecab0845ef3a3edfa02b961ea8283ee82ea82 Mon Sep 17 00:00:00 2001 From: normal Date: Fri, 30 Nov 2018 03:56:34 +0000 Subject: 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 --- test/testunit/test_parallel.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/testunit') diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index b11330b46d..2e5ad86733 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 -- cgit v1.2.3