* lib/test/unit.rb (Test::Unit.setup_argv): expands paths before

  requiring.  [ruby-dev:39012]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e5e198d51..35b939ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug  5 03:28:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): expands paths before
+	  requiring.  [ruby-dev:39012]
+
 Wed Aug  5 01:38:27 2009  Yusuke Endoh  <mame@tsg.ne.jp>
  
 	* lib/pp.rb (guard_inspect_key): untrust internal hash to prevent
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 3e2b38827..fd7fe06f4 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -32,7 +32,7 @@ module Test
       end
 
       files.map! {|f|
-        f = f.gsub(Regexp.compile(Regexp.quote(File::ALT_SEPARATOR)), File::SEPARATOR) if File::ALT_SEPARATOR
+        f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
         if File.directory? f
           Dir["#{f}/**/test_*.rb"]
         elsif File.file? f
@@ -47,12 +47,12 @@ module Test
       files.reject! {|f| reject_pat =~ f }
 
       files.each {|f|
-        d = File.dirname(File.expand_path(f))
+        d = File.dirname(path = File.expand_path(f))
         unless $:.include? d
           $: << d
         end
         begin
-          require f
+          require path
         rescue LoadError
           puts "#{f}: #{$!}"
         end