* lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023)

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

1 files changed, 6 insertions, 4 deletions

diff --git a/test/rake/helper.rb b/test/rake/helper.rb
index 74cab7559f..992c6bffae 100644
--- a/test/rake/helper.rb
+++ b/test/rake/helper.rb
@@ -2,7 +2,7 @@ require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 begin
-  gem 'minitest'
+  gem 'minitest', '~> 4'
 rescue Gem::LoadError
 end
 
@@ -11,13 +11,15 @@ require 'rake'
 require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
-require_relative 'support/ruby_runner'
-require_relative 'support/rakefile_definitions'
 
 begin
   require_relative '../ruby/envutil'
+  require_relative 'support/ruby_runner'
+  require_relative 'support/rakefile_definitions'
 rescue NoMethodError, LoadError
-  # for ruby trunk
+  # ruby 1.8
+  require 'test/support/ruby_runner'
+  require 'test/support/rakefile_definitions'
 end
 
 class Rake::TestCase < MiniTest::Unit::TestCase