From cce9eb092b7a8be2259c8fce5f286d183535ad3b Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 1 Mar 2008 08:51:37 +0000 Subject: * 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 --- lib/test/unit/collector/dir.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb index 59c664dbb7..365345430f 100644 --- a/lib/test/unit/collector/dir.rb +++ b/lib/test/unit/collector/dir.rb @@ -16,7 +16,7 @@ module Test @file = file @object_space = object_space @req = req - @pattern = [/\btest_.*\.rb\Z/m] + @pattern = [] @exclude = [] end @@ -59,11 +59,12 @@ module Test next if(e == '.' || e == '..') e_name = dir_name ? @file.join(dir_name, e) : e 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_suites << sub_suite unless(sub_suite.empty?) else next if /~\z/ =~ e_name or /\A\.\#/ =~ e + next unless /\Atest_.*\.rb\z/m =~ e if @pattern and !@pattern.empty? next unless @pattern.any? {|pat| pat =~ e_name} end -- cgit v1.2.3