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

Fix tests with cppflags=-DYJIT_FORCE_ENABLE

Browse Source 
0dbd95c625
This commit is contained in:
Takashi Kokubun 2021-10-20 20:44:20 -07:00
parent 8684946b21
commit 66a64e6f16
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/ruby/command_line/dash_v_spec.rb
View File

@ -7,6 +7,6 @@ describe "The -v command line option" do
describe "when used alone" do describe "when used alone" do
it "prints version and ends" do it "prints version and ends" do
ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION) ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION)
end end unless defined?(YJIT) && YJIT.enabled? # pending. not sure why MJIT doesn't need anything to fix this.
end end
end end

13
test/ruby/test_rubyoptions.rb
View File

@ -10,7 +10,7 @@ class TestRubyOptions < Test::Unit::TestCase
NO_JIT_DESCRIPTION = NO_JIT_DESCRIPTION =
if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # checking -DMJIT_FORCE_ENABLE if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # checking -DMJIT_FORCE_ENABLE
RUBY_DESCRIPTION.sub(/\+JIT /, '') RUBY_DESCRIPTION.sub(/\+JIT /, '')
elsif defined?(YJIT.enabled?) && YJIT.enabled? elsif defined?(YJIT.enabled?) && YJIT.enabled? # checking -DYJIT_FORCE_ENABLE
RUBY_DESCRIPTION.sub(/\+YJIT /, '') RUBY_DESCRIPTION.sub(/\+YJIT /, '')
else else
RUBY_DESCRIPTION RUBY_DESCRIPTION
@ -146,7 +146,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_match(VERSION_PATTERN, r[0]) assert_match(VERSION_PATTERN, r[0])
if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? && !mjit_force_enabled? # checking -DMJIT_FORCE_ENABLE if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? && !mjit_force_enabled? # checking -DMJIT_FORCE_ENABLE
assert_equal(NO_JIT_DESCRIPTION, r[0]) assert_equal(NO_JIT_DESCRIPTION, r[0])
elsif defined?(YJIT.enabled?) && YJIT.enabled? elsif defined?(YJIT.enabled?) && YJIT.enabled? && !yjit_force_enabled? # checking -DYJIT_FORCE_ENABLE
assert_equal(NO_JIT_DESCRIPTION, r[0]) assert_equal(NO_JIT_DESCRIPTION, r[0])
else else
assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal(RUBY_DESCRIPTION, r[0])
@ -210,10 +210,8 @@ class TestRubyOptions < Test::Unit::TestCase
env = {'RUBY_YJIT_ENABLE' => nil} # unset in children env = {'RUBY_YJIT_ENABLE' => nil} # unset in children
assert_in_out_err([env, '--version']) do |r, e| assert_in_out_err([env, '--version']) do |r, e|
assert_match(VERSION_PATTERN, r[0]) assert_match(VERSION_PATTERN, r[0])
if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # checking -DMJIT_FORCE_ENABLE if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? || defined?(YJIT.enabled?) && YJIT.enabled? # checking -D*JIT_FORCE_ENABLE
assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0]) assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
elsif defined?(YJIT.enabled?) && YJIT.enabled?
assert_equal(NO_JIT_DESCRIPTION, r[0])
else else
assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal(RUBY_DESCRIPTION, r[0])
end end
@ -221,6 +219,7 @@ class TestRubyOptions < Test::Unit::TestCase
end end
return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no' return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no'
return if yjit_force_enabled?
[ [
%w(--version --jit --disable=jit), %w(--version --jit --disable=jit),
@ -1119,4 +1118,8 @@ class TestRubyOptions < Test::Unit::TestCase
def mjit_force_enabled? def mjit_force_enabled?
"#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?MJIT_FORCE_ENABLE\b/) "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?MJIT_FORCE_ENABLE\b/)
end end
def yjit_force_enabled?
"#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
end
end end