3 files changed, 39 insertions, 78 deletions
diff --git a/test/lib/!Nothing_to_test.rb b/test/lib/!Nothing_to_test.rb
new file mode 100644
index 0000000000..c1f4c439d3
--- /dev/null
+++ b/test/lib/!Nothing_to_test.rb
@@ -0,0 +1,5 @@
+### Empty test file for chkbuild ###
+
+# If chkbuild fails with `test-all`, each child file/directory is
+# executed individually, but test-unit fails if there are no test
+# files in the specified directory.
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 3bca63a549..386a5a6f1e 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -1,93 +1,29 @@
 require 'rbconfig'
 
 module JITSupport
-  JIT_TIMEOUT = 600 # 10min for each...
-  JIT_SUCCESS_PREFIX = 'JIT success \(\d+\.\dms\)'
-  JIT_RECOMPILE_PREFIX = 'JIT recompile'
-  JIT_COMPACTION_PREFIX = 'JIT compaction \(\d+\.\dms\)'
-  UNSUPPORTED_COMPILERS = [
-    %r[\A.*/bin/intel64/icc\b],
-    %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z],
-  ]
-  # debian-riscv64: "gcc: internal compiler error: Segmentation fault signal terminated program cc1" https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian-riscv64/ruby-master/log/20200420T083601Z.fail.html.gz
-  # freebsd12: cc1 internal failure https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd12/ruby-master/log/20200306T103003Z.fail.html.gz
-  # rhel8: one or more PCH files were found, but they were invalid https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20200306T153003Z.fail.html.gz
-  # centos8: ditto https://rubyci.org/logs/rubyci.s3.amazonaws.com/centos8/ruby-master/log/20200512T003004Z.fail.html.gz
-  PENDING_RUBYCI_NICKNAMES = %w[
-    debian-riscv64
-    freebsd12
-    rhel8
-    centos8
-  ]
-
   module_function
-  # Run Ruby script with --jit-wait (Synchronous JIT compilation).
-  # Returns [stdout, stderr]
-  def eval_with_jit(env = nil, script, **opts)
-    stdout, stderr = nil, nil
-    # retry 3 times while cc1 error happens.
-    3.times do |i|
-      stdout, stderr, status = eval_with_jit_without_retry(env, script, **opts)
-      assert_equal(true, status.success?, "Failed to run script with JIT:\n#{code_block(script)}\nstdout:\n#{code_block(stdout)}\nstderr:\n#{code_block(stderr)}")
-      break unless retried_stderr?(stderr)
-    end
-    [stdout, stderr]
-  end
-
-  def eval_with_jit_without_retry(env = nil, script, verbose: 0, min_calls: 5, save_temps: false, max_cache: 1000, wait: true, timeout: JIT_TIMEOUT)
-    args = [
-      '--disable-gems', "--jit-verbose=#{verbose}",
-      "--jit-min-calls=#{min_calls}", "--jit-max-cache=#{max_cache}",
-    ]
-    args << '--jit-wait' if wait
-    args << '--jit-save-temps' if save_temps
-    args << '--jit-debug' if defined?(@jit_debug) && @jit_debug
-    args << '-e' << script
-    base_env = { 'MJIT_SEARCH_BUILD_DIR' => 'true' } # workaround to skip requiring `make install` for `make test-all`
-    if preloadenv = RbConfig::CONFIG['PRELOADENV'] and !preloadenv.empty?
-      so = "mjit_build_dir.#{RbConfig::CONFIG['SOEXT']}"
-      base_env[preloadenv] = File.realpath(so) rescue nil
-    end
-    args.unshift(env ? base_env.merge!(env) : base_env)
-    EnvUtil.invoke_ruby(args,
-      '', true, true, timeout: timeout,
-    )
-  end
 
-  def supported?
-    return @supported if defined?(@supported)
-    @supported = RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' && UNSUPPORTED_COMPILERS.all? do |regexp|
-      !regexp.match?(RbConfig::CONFIG['MJIT_CC'])
-    end && !appveyor_pdb_corrupted? && !PENDING_RUBYCI_NICKNAMES.include?(ENV['RUBYCI_NICKNAME'])
+  def yjit_supported?
+    return @yjit_supported if defined?(@yjit_supported)
+    # nil in mswin
+    @yjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['YJIT_SUPPORT'])
   end
 
-  # AppVeyor's Visual Studio 2013 / 2015 are known to spuriously generate broken pch / pdb, like:
-  # error C2859: c:\projects\ruby\x64-mswin_120\include\ruby-2.8.0\x64-mswin64_120\rb_mjit_header-2.8.0.pdb
-  # is not the pdb file that was used when this precompiled header was created, recreate the precompiled header.
-  # https://ci.appveyor.com/project/ruby/ruby/builds/32159878/job/l2p38snw8yxxpp8h
-  #
-  # Until we figure out why, this allows us to skip testing JIT when it happens.
-  def appveyor_pdb_corrupted?
-    return false unless ENV.key?('APPVEYOR')
-    stdout, _stderr, _status = eval_with_jit_without_retry('proc {}.call', verbose: 2, min_calls: 1)
-    stdout.include?('.pdb is not the pdb file that was used when this precompiled header was created, recreate the precompiled header.')
+  def yjit_enabled?
+    defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
   end
 
-  def remove_mjit_logs(stderr)
-    if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # utility for -DFORCE_MJIT_ENABLE
-      stderr.gsub(/^MJIT warning: Skipped to compile unsupported instruction: \w+\n/m, '')
-    else
-      stderr
-    end
+  def yjit_force_enabled?
+    "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
   end
 
-  def code_block(code)
-    %Q["""\n#{code}\n"""\n\n]
+  def zjit_supported?
+    return @zjit_supported if defined?(@zjit_supported)
+    # nil in mswin
+    @zjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['ZJIT_SUPPORT'])
   end
 
-  # We're retrying cc1 not found error on gcc, which should be solved in the future but ignored for now.
-  def retried_stderr?(stderr)
-    RbConfig::CONFIG['CC'].start_with?('gcc') &&
-      stderr.include?("error trying to exec 'cc1': execvp: No such file or directory")
+  def zjit_enabled?
+    defined?(RubyVM::ZJIT) && RubyVM::ZJIT.enabled?
   end
 end
diff --git a/test/lib/parser_support.rb b/test/lib/parser_support.rb
new file mode 100644
index 0000000000..0daf45e87b
--- /dev/null
+++ b/test/lib/parser_support.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ParserSupport
+  module_function
+
+  # Determines whether or not Prism is being used in the current process. This
+  # would have been determined by `--parser=prism` on either the command line or
+  # from within various environment variables.
+  def prism_enabled?
+    RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+  end
+
+  # Determines whether or not Prism would be used by a subprocess. This is
+  # necessary because some tests run in subprocesses, and we need to know if we
+  # expect Prism to be used by those tests. This happens if Prism is configured
+  # as the default parser.
+  def prism_enabled_in_subprocess?
+    EnvUtil.invoke_ruby(["-v"], "", true, false)[0].include?("+PRISM")
+  end
+end