From 27841c008e0d22c4ebaed88af90f850c931da49d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 2 Oct 2006 14:48:44 +0000 Subject: * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file): load expanded path. fixed: [ruby-dev:29621] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/test/unit/collector/dir.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a1cf55d28..d50241a3d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,13 @@ -Mon Oct 2 22:28:17 2006 Nobuyoshi Nakada +Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS): base directory should be lower precedence. fixed: [ruby-dev:29622] * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo. + * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file): + load expanded path. fixed: [ruby-dev:29621] + Mon Oct 2 15:47:55 2006 NAKAMURA Usaku * instruby.rb: batfile should be CRLF'ed. diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb index 2cee7dde44..dadd9408c7 100644 --- a/lib/test/unit/collector/dir.rb +++ b/lib/test/unit/collector/dir.rb @@ -77,7 +77,7 @@ module Test end def collect_file(name, suites, already_gathered) - dir = File.dirname(File.expand_path(name, @base)) + dir = File.dirname(name = File.expand_path(name, @base)) $:.unshift(dir) if(@req) @req.require(name) -- cgit v1.2.3