* lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-30 13:30:39 +00:00
Родитель 9e3e19cd1f
Коммит fce76df67c
2 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,7 @@
Mon Jun 30 22:30:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.
Mon Jun 30 22:27:39 2008 Yusuke Endoh <mame@tsg.ne.jp> Mon Jun 30 22:27:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
* ext/stringio/stringio.c (strio_getline): fix for nil and "" as * ext/stringio/stringio.c (strio_getline): fix for nil and "" as

Просмотреть файл

@ -16,7 +16,7 @@ module Test
@file = file @file = file
@object_space = object_space @object_space = object_space
@req = req @req = req
@pattern = [] @pattern = [/\btest_.*\.rb\Z/m]
@exclude = [] @exclude = []
end end
@ -64,7 +64,6 @@ module Test
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