* test/rake/helper.rb: Load envutil correctly. Removed useless rescue

for signal propagation tests
* lib/rake/file_utils.rb:  Prefer the built ruby.
* test/rake/test_rake_functional.rb:  ditto


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

ChangeLog

@@ -1,3 +1,10 @@
+Thu Dec  6 16:35:21 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rake/helper.rb:  Load envutil correctly.  Removed useless rescue
+	  for signal propagation tests
+	* lib/rake/file_utils.rb:  Prefer the built ruby.
+	* test/rake/test_rake_functional.rb:  ditto
+
 Thu Dec  6 15:20:34 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/context.rb:  Don't warn for duplicate methods while loading.

lib/rake/file_utils.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 # added to the FileUtils utility functions.
 module FileUtils
   # Path to the currently running Ruby program
-  RUBY = File.join(
+  RUBY = ENV['RUBY'] || File.join(
     RbConfig::CONFIG['bindir'],
     RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']).
     sub(/.*\s.*/m, '"\&"')

test/rake/helper.rb

@@ -12,8 +12,8 @@ require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
 begin
-  require 'test/ruby/envutil'
-rescue LoadError
+  require_relative '../ruby/envutil'
+rescue NoMethodError, LoadError
   # for ruby trunk
 end
 
@@ -515,8 +515,8 @@ Rake::TestTask.new(:b) do |t|
 end
 
 task :test do
-  Rake::Task[:a].invoke rescue nil
-  Rake::Task[:b].invoke rescue nil
+  Rake::Task[:a].invoke
+  Rake::Task[:b].invoke
 end
 
 task :default => :test

test/rake/test_rake_functional.rb

@@ -471,7 +471,7 @@ class TestRakeFunctional < Rake::TestCase
   def run_ruby(option_list)
     puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
 
-    inn, out, err, wait = Open3.popen3(Gem.ruby, *option_list)
+    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
     inn.close
 
     @out = out.read