[前][次][番号順一覧][スレッド一覧]

ruby-changes:4172

From: ko1@a...
Date: Sat, 1 Mar 2008 17:52:01 +0900 (JST)
Subject: [ruby-changes:4172] nobu - Ruby:r15662 (trunk): * lib/test/unit/collector/dir.rb (recursive_collect): do not always

nobu	2008-03-01 17:51:37 +0900 (Sat, 01 Mar 2008)

  New Revision: 15662

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit/collector/dir.rb

  Log:
    * lib/test/unit/collector/dir.rb (recursive_collect): do not always
      include all test_*.rb.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15662&r2=15661&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/test/unit/collector/dir.rb?r1=15662&r2=15661&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15661)
+++ ChangeLog	(revision 15662)
@@ -1,3 +1,8 @@
+Sat Mar  1 17:51:34 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* development snapshot 1.9.0-1 released.
Index: lib/test/unit/collector/dir.rb
===================================================================
--- lib/test/unit/collector/dir.rb	(revision 15661)
+++ lib/test/unit/collector/dir.rb	(revision 15662)
@@ -16,7 +16,7 @@
           @file = file
           @object_space = object_space
           @req = req
-          @pattern = [/\btest_.*\.rb\Z/m]
+          @pattern = []
           @exclude = []
         end
 
@@ -59,11 +59,12 @@
               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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]