* lib/test/unit.rb (Test::Unit::GlobOption): merged RejectOption.

* test/runner.rb: utilize GlobOption.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 12 deletions

diff --git a/test/runner.rb b/test/runner.rb
index 6fd02a80ae..c92cb2670f 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -6,21 +6,12 @@ require 'test/unit'
 src_testdir = File.dirname(File.expand_path(__FILE__))
 srcdir = File.dirname(src_testdir)
 
-tests = Test::Unit.new {|files|
+tests = Test::Unit.new {|files, options|
+  options[:base_directory] = src_testdir
   if files.empty?
     [src_testdir]
   else
-    files.map {|f|
-      if File.exist? "#{src_testdir}/#{f}"
-        "#{src_testdir}/#{f}"
-      elsif File.exist? "#{srcdir}/#{f}"
-        "#{srcdir}/#{f}"
-      elsif File.exist? f
-        f
-      else
-        raise ArgumentError, "not found: #{f}"
-      end
-    }
+    files
   end
 }
 exit tests.run(ARGV) || true