summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit/collector/dir.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 4e553db4df..97c8d28481 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -22,7 +22,7 @@ module Test
def collect(*from)
basedir = @base
- $:.unshift(basedir) if basedir
+ $:.push(basedir) if basedir
if(from.empty?)
recursive_collect('.', find_test_cases)
elsif(from.size == 1)
@@ -54,9 +54,10 @@ module Test
sub_suites = []
path = realdir(name)
if @file.directory?(path)
+ dir_name = name unless name == '.'
@dir.entries(path).each do |e|
next if(e == '.' || e == '..')
- e_name = @file.join(name, e)
+ e_name = dir_name ? @file.join(dir_name, e) : e
if @file.directory?(realdir(e_name))
next if /\ACVS\z/ =~ e
sub_suite = recursive_collect(e_name, already_gathered)