Propagate JIT skip to all tests

2 files changed, 7 insertions, 8 deletions

diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 018a364373..b6f7a5830a 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -8,6 +8,12 @@ module JITSupport
     %r[\A.*/bin/intel64/icc\b],
     %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z],
   ]
+  # 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
+  PENDING_RUBYCI_NICKNAMES = %w[
+    freebsd12
+    rhel8
+  ]
 
   module_function
   # Run Ruby script with --jit-wait (Synchronous JIT compilation).
@@ -47,7 +53,7 @@ module JITSupport
     return @supported if defined?(@supported)
     @supported = UNSUPPORTED_COMPILERS.all? do |regexp|
       !regexp.match?(RbConfig::CONFIG['MJIT_CC'])
-    end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no'
+    end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' && !PENDING_RUBYCI_NICKNAMES.include?(ENV['RUBYCI_NICKNAME'])
   end
 
   def remove_mjit_logs(stderr)
diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb
index 57c632d022..e3d8f9cee2 100644
--- a/test/ruby/test_jit.rb
+++ b/test/ruby/test_jit.rb
@@ -43,13 +43,6 @@ class TestJIT < Test::Unit::TestCase
       skip 'JIT seems not supported on this platform'
     end
 
-    # 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
-    case ENV['RUBYCI_NICKNAME']
-    when 'freebsd12', 'rhel8'
-      skip 'investigating failures on RubyCI'
-    end
-
     # ruby -w -Itest/lib test/ruby/test_jit.rb
     if $VERBOSE && !defined?(@@at_exit_hooked)
       at_exit do