Merge rubygems master from upstream.

  I picked the commit from 3c469e0da538428a0ddd94f99aa73c32da22e8ba

1 files changed, 6 insertions, 1 deletions

diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 678dde2cae..7c86748a87 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -162,6 +162,10 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_activate_via_require_respects_loaded_files
+    skip "Not sure what's going on. If another spec creates a 'a' gem before
+      this test, somehow require will load the benchmark in b, and ignore that the
+      stdlib one is already in $LOADED_FEATURES?. Reproducible by running the
+      spaceship_specific_file test before this one" if java_platform?
     a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
     b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
     b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
@@ -431,7 +435,8 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
-  if RUBY_VERSION >= "2.5"
+  # uplevel is 2.5+ only and jruby has some issues with it
+  if RUBY_VERSION >= "2.5" && !java_platform?
     def test_no_kernel_require_in_warn_with_uplevel
       lib = File.realpath("../../../lib", __FILE__)
       Dir.mktmpdir("warn_test") do |dir|