From bb1fb1167e09b88f3c41a7b7e1c6aca14b74b4b7 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 30 May 2014 06:27:23 +0000 Subject: minitest/unit.rb: defer requiring -test- * test/lib/minitest/unit.rb (find_fds): defer requiring a library under "-test-" until needed, or can't work in other (installed) ruby. grep doesn't need separated map. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/minitest/unit.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'test/lib') diff --git a/test/lib/minitest/unit.rb b/test/lib/minitest/unit.rb index 2f31d6d2e9..4dc4d33f24 100644 --- a/test/lib/minitest/unit.rb +++ b/test/lib/minitest/unit.rb @@ -2,7 +2,6 @@ require "optparse" require "rbconfig" -require "-test-/dir" ## # Minimal (mostly drop-in) replacement for test-unit. @@ -991,19 +990,17 @@ module MiniTest end def find_fds - fd_dir = "/proc/#{$$}/fd" + fd_dir = "/proc/self/fd" if File.directory?(fd_dir) + require "-test-/dir" fds = Dir.open(fd_dir) {|d| - a = [] - while fn = d.read - a << fn - end + a = d.grep(/\A\d+\z/, &:to_i) if d.respond_to? :fileno - a -= [d.fileno.to_s] + a -= [d.fileno] end a } - fds.grep(/\A\d+\z/).map(&:to_i).sort + fds.sort else [] end -- cgit v1.2.3