aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit.rb2
2 files changed, 6 insertions, 1 deletions
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