* lib/rake: updated to rake code to rake-0.8.7 source code base.

* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#process_line):
  respace dependencies too.


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

1 files changed, 3 insertions, 12 deletions

diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
index 3444012500..c400205ff3 100644
--- a/lib/rake/testtask.rb
+++ b/lib/rake/testtask.rb
@@ -93,7 +93,7 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      lib_path = @libs.collect {|path| "-I#{File.expand_path(path)}"}
+      lib_path = @libs.join(File::PATH_SEPARATOR)
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
         run_code = ''
@@ -103,11 +103,11 @@ module Rake
             when :direct
               "-e 'ARGV.each{|f| load f}'"
             when :testrb
-              "-S testrb #{fix}"
+              "-S testrb"
             when :rake
               rake_loader
             end
-          @ruby_opts.unshift( *lib_path )
+          @ruby_opts.unshift( "-I\"#{lib_path}\"" )
           @ruby_opts.unshift( "-w" ) if @warning
           ruby @ruby_opts.join(" ") +
             " \"#{run_code}\" " +
@@ -133,15 +133,6 @@ module Rake
       end
     end
 
-    def fix # :nodoc:
-      case RUBY_VERSION
-      when '1.8.2'
-        find_file 'rake/ruby182_test_unit_fix'
-      else
-        nil
-      end || ''
-    end
-
     def rake_loader # :nodoc:
       find_file('rake/rake_test_loader') or
         fail "unable to find rake test loader"