summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-30 13:30:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-30 13:30:39 +0000
commitfce76df67ce82cca43f7bffae1dd1fdf7b433cae (patch)
tree39139c14b2830b8400631a7ef4893f4fc116000f
parent9e3e19cd1fd923dc27fbbdfdde5fe88f1d0e106b (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/test/unit/collector/dir.rb3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c612a9e377..566c33c5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* ext/stringio/stringio.c (strio_getline): fix for nil and "" as
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 365345430f..154c402a25 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 = []
+ @pattern = [/\btest_.*\.rb\Z/m]
@exclude = []
end
@@ -64,7 +64,6 @@ module Test
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