summaryrefslogtreecommitdiff
path: root/lib/test/unit/collector/dir.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/test/unit/collector/dir.rb')
-rw-r--r--lib/test/unit/collector/dir.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index dadd9408c7..4e553db4df 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -21,6 +21,8 @@ module Test
end
def collect(*from)
+ basedir = @base
+ $:.unshift(basedir) if basedir
if(from.empty?)
recursive_collect('.', find_test_cases)
elsif(from.size == 1)
@@ -35,6 +37,8 @@ module Test
sort(suites).each{|s| suite << s}
suite
end
+ ensure
+ $:.delete_at($:.rindex(basedir)) if basedir
end
def find_test_cases(ignore=[])
@@ -77,7 +81,7 @@ module Test
end
def collect_file(name, suites, already_gathered)
- dir = File.dirname(name = File.expand_path(name, @base))
+ dir = @file.dirname(@file.expand_path(name, @base))
$:.unshift(dir)
if(@req)
@req.require(name)