diff options
Diffstat (limited to 'test/rake')
-rw-r--r-- | test/rake/helper.rb | 8 | ||||
-rw-r--r-- | test/rake/test_rake_functional.rb | 2 |
2 files changed, 5 insertions, 5 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 diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb index 050a9456f0..d540e2ab29 100644 --- a/test/rake/test_rake_functional.rb +++ b/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 |