summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-24 12:57:40 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-24 12:57:40 +0000
commit8d988784c344fa6a3db2cd614d422a22c9b657a8 (patch)
tree403ec15d5a1468400283a1a8528eb92daf2658aa
parent9fa4766e141a01e74a0276450e295e11a36033a9 (diff)
test_rubyoptions.rb: allow passing test_verbose
with -DMJIT_FORCE_ENABLE. With -DMJIT_FORCE_ENABLE, absence of --jit doesn't mean JIT disabled. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_rubyoptions.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 2a67eaef79..15271cd6e8 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -116,7 +116,11 @@ class TestRubyOptions < Test::Unit::TestCase
def test_verbose
assert_in_out_err(["-vve", ""]) do |r, e|
assert_match(VERSION_PATTERN, r[0])
- assert_equal(NO_JIT_DESCRIPTION, r[0])
+ if RbConfig::CONFIG['cppflags'].match?(/(\A|\s)-DMJIT_FORCE_ENABLE\b/)
+ assert_equal(RUBY_DESCRIPTION, r[0])
+ else
+ assert_equal(NO_JIT_DESCRIPTION, r[0])
+ end
assert_equal([], e)
end