1 files changed, 63 insertions, 58 deletions

diff --git a/tool/lib/_tmpdir.rb b/tool/lib/_tmpdir.rb
index fd429dab37..ac5b9be792 100644
--- a/tool/lib/_tmpdir.rb
+++ b/tool/lib/_tmpdir.rb
@@ -4,11 +4,11 @@ template = "rubytest."
 # Assume the directory by these environment variables are safe.
 base = [ENV["TMPDIR"], ENV["TMP"], "/tmp"].find do |tmp|
   next unless tmp and tmp.size <= 50 and File.directory?(tmp)
-  # On macOS, the default TMPDIR is very long, inspite of UNIX socket
-  # path length is limited.
+  # On macOS, the default TMPDIR is very long, in spite of UNIX socket
+  # path length being limited.
   #
   # Also Rubygems creates its own temporary directory per tests, and
-  # some tests copy the full path of gemhome there.  In that caes, the
+  # some tests copy the full path of gemhome there.  In that case, the
   # path contains both temporary names twice, and can exceed path name
   # limit very easily.
   tmp
@@ -28,66 +28,71 @@ END {
       Dir.rmdir(tmpdir)
     rescue Errno::ENOENT
     rescue Errno::ENOTEMPTY
-      require_relative "colorize"
-      colorize = Colorize.new
-      ls = Struct.new(:colorize) do
-        def mode_inspect(m, s)
-          [
-            (m & 0o4 == 0 ? ?- : ?r),
-            (m & 0o2 == 0 ? ?- : ?w),
-            (m & 0o1 == 0 ? (s ? s.upcase : ?-) : (s || ?x)),
-          ]
-        end
-        def decorate_path(path, st)
-          case
-          when st.directory?
-            color = "bold;blue"
-            type = "/"
-          when st.symlink?
-            color = "bold;cyan"
-            # type = "@"
-          when st.executable?
-            color = "bold;green"
-            type = "*"
-          when path.end_with?(".gem")
-            color = "green"
+      unless $no_report_tmpdir ||= nil
+        require_relative "colorize"
+        colorize = Colorize.new
+        ls = Struct.new(:colorize) do
+          def mode_inspect(m, s)
+            [
+              (m & 0o4 == 0 ? ?- : ?r),
+              (m & 0o2 == 0 ? ?- : ?w),
+              (m & 0o1 == 0 ? (s ? s.upcase : ?-) : (s || ?x)),
+            ]
           end
-          colorize.decorate(path, color) + (type || "")
-        end
-        def list_tree(parent, indent = "", &block)
-          children = Dir.children(parent).map do |child|
-            [child, path = File.join(parent, child), File.lstat(path)]
+          def decorate_path(path, st)
+            case
+            when st.directory?
+              color = "bold;blue"
+              type = "/"
+            when st.symlink?
+              color = "bold;cyan"
+            # type = "@"
+            when st.executable?
+              color = "bold;green"
+              type = "*"
+            when path.end_with?(".gem")
+              color = "green"
+            end
+            colorize.decorate(path, color) + (type || "")
           end
-          nlink_width = children.map {|child, path, st| st.nlink}.max.to_s.size
-          size_width = children.map {|child, path, st| st.size}.max.to_s.size
+          def list_tree(parent, indent = "", &block)
+            children = Dir.children(parent).map do |child|
+              [child, path = File.join(parent, child), File.lstat(path)]
+            end
+            nlink_width = children.map {|child, path, st| st.nlink}.max.to_s.size
+            size_width = children.map {|child, path, st| st.size}.max.to_s.size
 
-          children.each do |child, path, st|
-            m = st.mode
-            m = [
-              (st.file? ? ?- : st.ftype[0]),
-              mode_inspect(m >> 6, (?s unless m & 04000 == 0)),
-              mode_inspect(m >> 3, (?s unless m & 02000 == 0)),
-              mode_inspect(m,      (?t unless m & 01000 == 0)),
-            ].join("")
-            warn sprintf("%s* %s %*d %*d %s % s%s",
-                         indent, m, nlink_width, st.nlink, size_width, st.size,
-                         st.mtime.to_s, decorate_path(child,  st),
-                         (" -> " + decorate_path(File.readlink(path), File.stat(path)) if
-                           st.symlink?))
-            if st.directory?
-              list_tree(File.join(parent, child), indent + "  ", &block)
+            children.each do |child, path, st|
+              m = st.mode
+              m = [
+                (st.file? ? ?- : st.ftype[0]),
+                mode_inspect(m >> 6, (?s unless m & 04000 == 0)),
+                mode_inspect(m >> 3, (?s unless m & 02000 == 0)),
+                mode_inspect(m,      (?t unless m & 01000 == 0)),
+              ].join("")
+              warn sprintf("%s* %s %*d %*d %s % s%s",
+                           indent, m, nlink_width, st.nlink, size_width, st.size,
+                           st.mtime.to_s, decorate_path(child,  st),
+                           (" -> " + decorate_path(File.readlink(path), File.stat(path)) if
+                             st.symlink?))
+              if st.directory?
+                list_tree(File.join(parent, child), indent + "  ", &block)
+              end
+              yield path, st if block
             end
-            yield path, st if block
           end
-        end
-      end.new(colorize)
-      warn colorize.notice("Children under ")+colorize.fail(tmpdir)+":"
-      Dir.chdir(tmpdir) do
-        ls.list_tree(".") do |path, st|
-          if st.directory?
-            Dir.rmdir(path)
-          else
-            File.unlink(path)
+        end.new(colorize)
+        warn colorize.notice("Children under ")+colorize.fail(tmpdir)+":"
+        Dir.chdir(tmpdir) do
+          ls.list_tree(".") do |path, st|
+            if st.directory?
+              Dir.rmdir(path)
+            else
+              File.unlink(path)
+            end
+          rescue Errno::EACCES
+            # On Windows, a killed process may still hold file locks briefly.
+            # Ignore and let FileUtils.rm_rf handle it below.
           end
         end
       end