1 files changed, 3 insertions, 13 deletions
diff --git a/test/mkmf/test_find_executable.rb b/test/mkmf/test_find_executable.rb
index 87e1d03c51..5dca186a41 100644
--- a/test/mkmf/test_find_executable.rb
+++ b/test/mkmf/test_find_executable.rb
@@ -2,28 +2,18 @@ require_relative 'base'
 
 class TestMkmf
   class TestFindExecutable < TestMkmf
-    class F
-      def do_find_executable(name)
-        find_executable(name)
-      end
-    end
-
     def test_find_executable
       bug2669 = '[ruby-core:27912]'
       path, ENV["PATH"] = ENV["PATH"], path
       ENV["PATH"] = @tmpdir
-      f = F.new
       name = "foobar#{$$}#{rand(1000)}"
-      if /mswin\d|mingw|cygwin/ =~ RUBY_PLATFORM
-        exts = %w[.exe .com .cmd .bat]
-      else
-        exts = [""]
-      end
+      exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
+      exts[0] ||= ""
       exts.each do |ext|
         full = name+ext
         begin
           open(full, "w") {|ff| ff.chmod(0755)}
-          result = f.do_find_executable(name)
+          result = mkmf {find_executable(name)}
         ensure
           File.unlink(full)
         end