* 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

1 files changed, 4 insertions, 4 deletions

diff --git a/test/rake/helper.rb b/test/rake/helper.rb
index 8c228c5cfa..9817e8f0cd 100644
--- a/test/rake/helper.rb
+++ b/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