ruby-changes:59032
From: Takashi <ko1@a...>
Date: Mon, 2 Dec 2019 03:54:25 +0900 (JST)
Subject: [ruby-changes:59032] b3ea0980db (master): Check MJIT support in one place
https://git.ruby-lang.org/ruby.git/commit/?id=b3ea0980db From b3ea0980db87404c2b7763a3fdbe898c3812843d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Sun, 1 Dec 2019 10:53:58 -0800 Subject: Check MJIT support in one place to fix test failure on trunk-no-mjit https://gist.github.com/ko1/32ab982ffd7555988818773c08f97123 diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index bab1d4e..4f0d16d 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -47,7 +47,7 @@ module JITSupport https://github.com/ruby/ruby/blob/trunk/test/lib/jit_support.rb#L47 return @supported if defined?(@supported) @supported = UNSUPPORTED_COMPILERS.all? do |regexp| !regexp.match?(RbConfig::CONFIG['CC']) - end + 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 533ebbd..a8ce18b 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -3,8 +3,6 @@ require 'test/unit' https://github.com/ruby/ruby/blob/trunk/test/ruby/test_jit.rb#L3 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 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/