ZJIT: Fix tests for ZJIT (ruby#14460)

Author: k0kubun

test/-ext-/bug_reporter/test_bug_reporter.rb

@@ -20,7 +20,9 @@ def test_bug_reporter_add
 
     no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE)
     args = ["-r-test-/bug_reporter", "-C", tmpdir]
-    args.push("--yjit") if JITSupport.yjit_enabled? # We want the printed description to match this process's RUBY_DESCRIPTION
+    # We want the printed description to match this process's RUBY_DESCRIPTION
+    args.push("--yjit") if JITSupport.yjit_enabled?
+    args.push("--zjit") if JITSupport.zjit_enabled?
     args.unshift({"RUBY_ON_BUG" => nil})
     stdin = "#{no_core}register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
     assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")

test/.excludes-zjit/TestBugReporter.rb

@@ -10,7 +10,7 @@ def yjit_supported?
   end
 
   def yjit_enabled?
-    defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+    defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
   end
 
   def yjit_force_enabled?
@@ -22,4 +22,8 @@ def zjit_supported?
     # nil in mswin
     @zjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['ZJIT_SUPPORT'])
   end
+
+  def zjit_enabled?
+    defined?(RubyVM::ZJIT) && RubyVM::ZJIT.enabled?
+  end
 end

test/.excludes-zjit/TestGc.rb

@@ -8,8 +8,6 @@
 require_relative '../lib/parser_support'
 
 class TestRubyOptions < Test::Unit::TestCase
-  def self.yjit_enabled? = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
-
   # Here we're defining our own RUBY_DESCRIPTION without "+PRISM". We do this
   # here so that the various tests that reference RUBY_DESCRIPTION don't have to
   # worry about it. The flag itself is tested in its own test.
@@ -22,8 +20,10 @@ def self.yjit_enabled? = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
 
   NO_JIT_DESCRIPTION =
     case
-    when yjit_enabled?
-      RUBY_DESCRIPTION.sub(/\+YJIT( (dev|dev_nodebug|stats))? /, '')
+    when JITSupport.yjit_enabled?
+      RUBY_DESCRIPTION.sub(/\+YJIT( \w+)? /, '')
+    when JITSupport.zjit_enabled?
+      RUBY_DESCRIPTION.sub(/\+ZJIT( \w+)? /, '')
     else
       RUBY_DESCRIPTION
     end
@@ -181,7 +181,7 @@ def test_debug
   def test_verbose
     assert_in_out_err([{'RUBY_YJIT_ENABLE' => nil}, "-vve", ""]) do |r, e|
       assert_match(VERSION_PATTERN, r[0])
-      if self.class.yjit_enabled? && !JITSupport.yjit_force_enabled?
+      if (JITSupport.yjit_enabled? && !JITSupport.yjit_force_enabled?) || JITSupport.zjit_enabled?
         assert_equal(NO_JIT_DESCRIPTION, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -247,7 +247,7 @@ def test_version
       assert_match(VERSION_PATTERN, r[0])
       if ENV['RUBY_YJIT_ENABLE'] == '1'
         assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.yjit_enabled? # checking -DYJIT_FORCE_ENABLE
+      elsif JITSupport.yjit_enabled? || JITSupport.zjit_enabled? # checking -DYJIT_FORCE_ENABLE
         assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -852,7 +852,8 @@ def assert_segv(args, message=nil, list: SEGVTest::ExpectedStderrList, **opt, &b
     # We want YJIT to be enabled in the subprocess if it's enabled for us
     # so that the Ruby description matches.
     env = Hash === args.first ? args.shift : {}
-    args.unshift("--yjit") if self.class.yjit_enabled?
+    args.unshift("--yjit") if JITSupport.yjit_enabled?
+    args.unshift("--zjit") if JITSupport.zjit_enabled?
     env.update({'RUBY_ON_BUG' => nil})
     # ASAN registers a segv handler which prints out "AddressSanitizer: DEADLYSIGNAL" when
     # catching sigsegv; we don't expect that output, so suppress it.