diff options
Diffstat (limited to 'lib/test/unit/collector/dir.rb')
| -rw-r--r-- | lib/test/unit/collector/dir.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb index 43fd1be718..9342fdecbc 100644 --- a/lib/test/unit/collector/dir.rb +++ b/lib/test/unit/collector/dir.rb @@ -7,7 +7,7 @@ module Test class Dir include Collector - attr_writer :pattern + attr_reader :pattern, :exclude def initialize(dir=::Dir, file=::File, object_space=::ObjectSpace, req=nil) super() @@ -15,7 +15,8 @@ module Test @file = file @object_space = object_space @req = req - @pattern = /\Atest_.*\.rb\Z/m + @pattern = [/\btest_.*\.rb\Z/m] + @exclude = [] end def collect(*from) @@ -51,10 +52,17 @@ module Test next if(e == '.' || e == '..') e_name = @file.join(name, e) if(@file.directory?(e_name)) + next if /\ACVS\z/ =~ e sub_suite = recursive_collect(e_name, already_gathered) sub_suites << sub_suite unless(sub_suite.empty?) else - (next unless(@pattern =~ e)) if(@pattern) + next if /~\z/ =~ e_name or /\A\.\#/ =~ e + if @pattern and !@pattern.empty? + next unless @pattern.any? {|pat| pat =~ e_name} + end + if @exclude and !@exclude.empty? + next if @exclude.any? {|pat| pat =~ e_name} + end collect_file(e_name, sub_suites, already_gathered) end end @@ -76,7 +84,6 @@ module Test require(name) end find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)} - rescue LoadError, SystemExit ensure $:.replace(loadpath) end |