From 9736cb2bab9268b0520895ee8883174761c3b981 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 9 Sep 2011 18:56:11 -0700 Subject: rake already ships with a ruby command --- railties/Rakefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index be9a77d4e4..aa1dfa5dab 100755 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -17,8 +17,7 @@ namespace :test do dir = ENV["TEST_DIR"] || "**" Dir["test/#{dir}/*_test.rb"].each do |file| next true if file.include?("fixtures") - ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) - sh(ruby, '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file) + ruby '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file end end end -- cgit v1.2.3 From 0f04260c514fe0a58adb57f3b8d69f12f18cfe9e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 9 Sep 2011 19:00:33 -0700 Subject: railties depends on actionpack, so put actionpack in the include path --- railties/Rakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index aa1dfa5dab..25e515e016 100755 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -17,7 +17,13 @@ namespace :test do dir = ENV["TEST_DIR"] || "**" Dir["test/#{dir}/*_test.rb"].each do |file| next true if file.include?("fixtures") - ruby '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file + dash_i = [ + 'test', + 'lib', + "#{File.dirname(__FILE__)}/../activesupport/lib", + "#{File.dirname(__FILE__)}/../actionpack/lib" + ] + ruby "-I#{dash_i.join ':'}", file end end end -- cgit v1.2.3