зеркало из https://github.com/github/ruby.git
Use NO_JIT_DESCRIPTION only when needed
Apparently 203801566a
broke YJIT's CI.
This commit is contained in:
Родитель
203801566a
Коммит
fae568edbe
|
@ -7,10 +7,11 @@ require 'tempfile'
|
|||
require_relative '../lib/jit_support'
|
||||
|
||||
class TestRubyOptions < Test::Unit::TestCase
|
||||
def self.mjit_enabled? = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
|
||||
def self.yjit_enabled? = defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
|
||||
|
||||
NO_JIT_DESCRIPTION =
|
||||
if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
|
||||
if mjit_enabled?
|
||||
RUBY_DESCRIPTION.sub(/\+MJIT /, '')
|
||||
elsif yjit_enabled?
|
||||
RUBY_DESCRIPTION.sub(/\+YJIT /, '')
|
||||
|
@ -148,7 +149,7 @@ class TestRubyOptions < Test::Unit::TestCase
|
|||
def test_verbose
|
||||
assert_in_out_err([{'RUBY_YJIT_ENABLE' => nil}, "-vve", ""]) do |r, e|
|
||||
assert_match(VERSION_PATTERN, r[0])
|
||||
if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? && !JITSupport.mjit_force_enabled?
|
||||
if self.class.mjit_enabled? && !JITSupport.mjit_force_enabled?
|
||||
assert_equal(NO_JIT_DESCRIPTION, r[0])
|
||||
elsif self.class.yjit_enabled? && !yjit_force_enabled? # checking -DYJIT_FORCE_ENABLE
|
||||
assert_equal(NO_JIT_DESCRIPTION, r[0])
|
||||
|
@ -216,7 +217,7 @@ class TestRubyOptions < Test::Unit::TestCase
|
|||
assert_match(VERSION_PATTERN, r[0])
|
||||
if ENV['RUBY_YJIT_ENABLE'] == '1'
|
||||
assert_equal(NO_JIT_DESCRIPTION, r[0])
|
||||
elsif defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? || self.class.yjit_enabled? # checking -D(M|Y)JIT_FORCE_ENABLE
|
||||
elsif self.class.mjit_enabled? || self.class.yjit_enabled? # checking -D(M|Y)JIT_FORCE_ENABLE
|
||||
assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
|
||||
else
|
||||
assert_equal(RUBY_DESCRIPTION, r[0])
|
||||
|
@ -740,7 +741,7 @@ class TestRubyOptions < Test::Unit::TestCase
|
|||
-e:(?:1:)?\s\[BUG\]\sSegmentation\sfault.*\n
|
||||
)x,
|
||||
%r(
|
||||
#{ Regexp.quote(JITSupport.mjit_force_enabled? ? RUBY_DESCRIPTION : NO_JIT_DESCRIPTION) }\n\n
|
||||
#{ Regexp.quote((TestRubyOptions.mjit_enabled? && !JITSupport.mjit_force_enabled?) ? NO_JIT_DESCRIPTION : RUBY_DESCRIPTION) }\n\n
|
||||
)x,
|
||||
%r(
|
||||
(?:--\s(?:.+\n)*\n)?
|
||||
|
|
Загрузка…
Ссылка в новой задаче