diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/jit_support.rb | 6 | ||||
| -rw-r--r-- | test/ruby/test_jit.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index c1624cc3b2..5e47ff45e3 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -4,7 +4,7 @@ module JITSupport JIT_TIMEOUT = 600 # 10min for each... JIT_SUCCESS_PREFIX = 'JIT success \(\d+\.\dms\)' UNSUPPORTED_COMPILERS = [ - %r[\Aicc\b], + %r[\A.*/bin/intel64/icc\b], %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z], ] @@ -44,8 +44,8 @@ module JITSupport def supported? return @supported if defined?(@supported) @supported = UNSUPPORTED_COMPILERS.all? do |regexp| - !regexp.match?(RbConfig::CONFIG['CC']) - end + !regexp.match?(RbConfig::CONFIG['MJIT_CC']) + end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' end def remove_mjit_logs(stderr) diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index eae75b8ddf..fb63d4087c 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -3,8 +3,6 @@ require 'test/unit' require 'tmpdir' require_relative '../lib/jit_support' -return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no' - # Test for --jit option class TestJIT < Test::Unit::TestCase include JITSupport |