From d1d4490a57413ff5cb7e8bd0274bb34c7da68d29 Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 29 Nov 2012 19:16:46 +0000 Subject: * lib/rake/*: Updated to rake 0.9.5 * test/rake/*: ditto. * NEWS: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rake/test_rake_functional.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'test/rake/test_rake_functional.rb') diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb index 90e4064fbe..050a9456f0 100644 --- a/test/rake/test_rake_functional.rb +++ b/test/rake/test_rake_functional.rb @@ -5,9 +5,9 @@ require 'open3' class TestRakeFunctional < Rake::TestCase def setup - @rake_path = File.expand_path("../../../bin/rake", __FILE__) - lib_path = File.expand_path("../../../lib", __FILE__) - @ruby_options = ["-I#{lib_path}", "-I."] + super + + @ruby_options = ["-I#{@rake_lib}", "-I."] @verbose = ENV['VERBOSE'] if @verbose @@ -17,8 +17,6 @@ class TestRakeFunctional < Rake::TestCase puts @__name__ puts '-' * 80 end - - super end def test_rake_default @@ -466,7 +464,7 @@ class TestRakeFunctional < Rake::TestCase # command line ruby options are included. Output is captured in # @out and @err def rake(*rake_options) - run_ruby @ruby_options + [@rake_path] + rake_options + run_ruby @ruby_options + [@rake_exec] + rake_options end # Low level ruby command runner ... -- cgit v1.2.3