1 files changed, 8 insertions, 9 deletions
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
index e6b980a96b..218c6f3d5e 100644
--- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -15,7 +15,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
   end
 
   def test_class_build
-    if java_platform?
+    if Gem.java_platform?
       pend("failing on jruby")
     end
 
@@ -34,7 +34,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     assert_same result, output
 
     assert_match(/^current directory:/, output[0])
-    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
+    assert_match(/^#{Regexp.quote(Gem.ruby)}.* extconf.rb/, output[1])
     assert_equal "creating Makefile\n", output[2]
     assert_match(/^current directory:/, output[3])
     assert_contains_make_command "clean", output[4]
@@ -45,7 +45,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
   end
 
   def test_class_build_rbconfig_make_prog
-    if java_platform?
+    if Gem.java_platform?
       pend("failing on jruby")
     end
 
@@ -65,14 +65,14 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     end
   end
 
-  def test_class_build_env_MAKE
+  def test_class_build_env_make
     env_make = ENV.delete "make"
     ENV["make"] = nil
 
-    env_MAKE = ENV.delete "MAKE"
+    env_large_make = ENV.delete "MAKE"
     ENV["MAKE"] = "anothermake"
 
-    if java_platform?
+    if Gem.java_platform?
       pend("failing on jruby")
     end
 
@@ -91,7 +91,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       assert_contains_make_command "clean", output[4]
     end
   ensure
-    ENV["MAKE"] = env_MAKE
+    ENV["MAKE"] = env_large_make
     ENV["make"] = env_make
   end
 
@@ -114,7 +114,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     assert_equal "extconf failed, exit code 1", error.message
 
-    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
+    assert_match(/^#{Regexp.quote(Gem.ruby)}.* extconf.rb/, output[1])
     assert_match(File.join(@dest_path, "mkmf.log"), output[4])
     assert_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
@@ -218,7 +218,6 @@ end
     RbConfig::CONFIG["configure_args"] = args if args
 
     yield
-
   ensure
     if configure_args
       RbConfig::CONFIG["configure_args"] = configure_args