1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base

Browse Source 
directory but not prepend.

* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
  join with dot.  fixed: [ruby-core:09179]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-10-14 16:04:16 +00:00
parent 1b4f46a7f0
commit 499d04674c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Oct 15 01:03:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
directory but not prepend.
* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
join with dot. fixed: [ruby-core:09179]
Sat Oct 14 23:39:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Oct 14 23:39:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (singleton): no need to re-create NODE_SELF() again. * parse.y (singleton): no need to re-create NODE_SELF() again.

5
lib/test/unit/collector/dir.rb
View File

@ -22,7 +22,7 @@ module Test
def collect(*from) def collect(*from)
basedir = @base basedir = @base
$:.unshift(basedir) if basedir $:.push(basedir) if basedir
if(from.empty?) if(from.empty?)
recursive_collect('.', find_test_cases) recursive_collect('.', find_test_cases)
elsif(from.size == 1) elsif(from.size == 1)
@ -54,9 +54,10 @@ module Test
sub_suites = [] sub_suites = []
path = realdir(name) path = realdir(name)
if @file.directory?(path) if @file.directory?(path)
dir_name = name unless name == '.'
@dir.entries(path).each do |e| @dir.entries(path).each do |e|
next if(e == '.' || 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)) if @file.directory?(realdir(e_name))
next if /\ACVS\z/ =~ e next if /\ACVS\z/ =~ e
sub_suite = recursive_collect(e_name, already_gathered) sub_suite = recursive_collect(e_name, already_gathered)