1 files changed, 27 insertions, 4 deletions
diff --git a/test/mkmf/test_find_executable.rb b/test/mkmf/test_find_executable.rb
index 5ccec880fd..fe45ef2d1c 100644
--- a/test/mkmf/test_find_executable.rb
+++ b/test/mkmf/test_find_executable.rb
@@ -2,10 +2,18 @@ require_relative 'base'
 
 class TestMkmf
   class TestFindExecutable < TestMkmf
+    def setup
+      super
+      @path, ENV["PATH"] = ENV["PATH"], @tmpdir
+    end
+
+    def teardown
+      ENV["PATH"] = @path
+      super
+    end
+
     def test_find_executable
       bug2669 = '[ruby-core:27912]'
-      path, ENV["PATH"] = ENV["PATH"], path
-      ENV["PATH"] = @tmpdir
       name = "foobar#{$$}#{rand(1000)}"
       exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
       stdout.filter {|s| s.sub(name, "<executable>")}
@@ -20,8 +28,23 @@ class TestMkmf
         end
         assert_equal("#{@tmpdir}/#{name}#{ext}", result, bug2669)
       end
-    ensure
-      ENV["PATH"] = path
+    end
+
+    def test_find_executable_dir
+      name = "foobar#{$$}#{rand(1000)}"
+      exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
+      stdout.filter {|s| s.sub(name, "<executable>")}
+      exts[0] ||= ""
+      exts.each do |ext|
+        full = name+ext
+        begin
+          Dir.mkdir(full)
+          result = mkmf {find_executable(name)}
+        ensure
+          Dir.rmdir(full)
+        end
+        assert_nil(result)
+      end
     end
   end
 end