mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/test/unit/collector/dir.rb (recursive_collect): do not always
include all test_*.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e31eeedb94
commit
cce9eb092b
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sat Mar 1 17:51:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/test/unit/collector/dir.rb (recursive_collect): do not always
|
||||||
|
include all test_*.rb.
|
||||||
|
|
||||||
Sat Mar 1 14:14:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Sat Mar 1 14:14:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* development snapshot 1.9.0-1 released.
|
* development snapshot 1.9.0-1 released.
|
||||||
|
|
|
@ -16,7 +16,7 @@ module Test
|
||||||
@file = file
|
@file = file
|
||||||
@object_space = object_space
|
@object_space = object_space
|
||||||
@req = req
|
@req = req
|
||||||
@pattern = [/\btest_.*\.rb\Z/m]
|
@pattern = []
|
||||||
@exclude = []
|
@exclude = []
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -59,11 +59,12 @@ module Test
|
||||||
next if(e == '.' || e == '..')
|
next if(e == '.' || e == '..')
|
||||||
e_name = dir_name ? @file.join(dir_name, e) : 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 /\A(?:CVS|\.svn)\z/ =~ e
|
||||||
sub_suite = recursive_collect(e_name, already_gathered)
|
sub_suite = recursive_collect(e_name, already_gathered)
|
||||||
sub_suites << sub_suite unless(sub_suite.empty?)
|
sub_suites << sub_suite unless(sub_suite.empty?)
|
||||||
else
|
else
|
||||||
next if /~\z/ =~ e_name or /\A\.\#/ =~ e
|
next if /~\z/ =~ e_name or /\A\.\#/ =~ e
|
||||||
|
next unless /\Atest_.*\.rb\z/m =~ e
|
||||||
if @pattern and !@pattern.empty?
|
if @pattern and !@pattern.empty?
|
||||||
next unless @pattern.any? {|pat| pat =~ e_name}
|
next unless @pattern.any? {|pat| pat =~ e_name}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue