diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/test/unit.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Jun 13 14:17:00 2011 Kenta Murata <mrkn@mrkn.jp> + + * lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix typo. + Mon Jun 13 13:04:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_digest.c: fix error for digests that have no oid diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 186545152d..72d403417f 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -143,7 +143,7 @@ module Test end files.map! {|f| f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR - ((paths if /\A\.\.?(?:\z|\/)/ !~ f) | [nil]).any? do |prefix| + ((paths if /\A\.\.?(?:\z|\/)/ !~ f) || [nil]).any? do |prefix| if prefix path = f.empty? ? prefix : "#{prefix}/#{f}" else |