1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_jit.rb: check JIT support more conservatively

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-02-08 12:58:27 +00:00
parent 0468f13606
commit 7e57ff99e5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/ruby/test_jit.rb
View File

@ -43,12 +43,12 @@ class TestJIT < Test::Unit::TestCase
# Run Ruby script with --jit-wait (Synchronous JIT compilation). # Run Ruby script with --jit-wait (Synchronous JIT compilation).
# Returns [stdout, stderr] # Returns [stdout, stderr]
def eval_with_jit(script, verbose: 0, min_calls: 5) def eval_with_jit(script, verbose: 0, min_calls: 5, timeout: JIT_TIMEOUT)
stdout, stderr, status = EnvUtil.invoke_ruby( stdout, stderr, status = EnvUtil.invoke_ruby(
['--disable-gems', '--jit-wait', "--jit-verbose=#{verbose}", "--jit-min-calls=#{min_calls}", '-e', script], ['--disable-gems', '--jit-wait', "--jit-verbose=#{verbose}", "--jit-min-calls=#{min_calls}", '-e', script],
'', true, true, timeout: JIT_TIMEOUT, '', true, true, timeout: timeout,
) )
assert_equal(true, status.success?, "Failed to run script with JIT:\n#{code_block(script)}") assert_equal(true, status.success?, "Failed to run script with JIT:\n#{code_block(script)}\nstdout:\n#{code_block(stdout)}\nstderr:\n#{code_block(stderr)}")
[stdout, stderr] [stdout, stderr]
end end
@ -61,7 +61,11 @@ class TestJIT < Test::Unit::TestCase
def jit_supported? def jit_supported?
return @jit_supported if defined?(@jit_supported) return @jit_supported if defined?(@jit_supported)
out = IO.popen("#{RbConfig::CONFIG['CC']} --version", err: [:child, :out], &:read) begin
@jit_supported = $?.success? && SUPPORTED_COMPILERS.any? { |cc| out.match(/\b#{Regexp.escape(cc)}\b/) } @jit_supported = eval_with_jit('proc {}.call', verbose: 1, min_calls: 1, timeout: 10)
rescue Timeout::Error
$stderr.puts "TestJIT: #jit_supported? check timed out"
@jit_supported = false
end
end end
end end