From da923d2b1f6de3ba2947c83cf89c6affd85cc0d9 Mon Sep 17 00:00:00 2001
From: mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Jun 2011 05:22:40 +0000
Subject: [PATCH] * lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix
 typo.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        | 4 ++++
 lib/test/unit.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index de305f7dd0..3c436b4cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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