From 95e42dc1526405e7c7310e39d0c369e9d436a7b9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 Jun 2011 10:04:19 +0000
Subject: * lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run  
 with 1.8.

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

diff --git a/ChangeLog b/ChangeLog
index 3a62905dd6..88796fbd48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 11 19:04:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run
+	  with 1.8.
+
 Sat Jun 11 18:05:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* bootstraptest/runner.rb: should initilize $stress to avoid warnings.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 478395d8cc..186545152d 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].uniq.any? do |prefix|
+          ((paths if /\A\.\.?(?:\z|\/)/ !~ f) | [nil]).any? do |prefix|
             if prefix
               path = f.empty? ? prefix : "#{prefix}/#{f}"
             else
-- 
cgit v1.2.3