diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/rake/file_utils.rb | 2 | ||||
| -rw-r--r-- | test/rake/helper.rb | 8 | ||||
| -rw-r--r-- | test/rake/test_rake_functional.rb | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -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. diff --git a/lib/rake/file_utils.rb b/lib/rake/file_utils.rb index e02d541ab8..606bfb65b5 100644 --- a/lib/rake/file_utils.rb +++ b/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, '"\&"') 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 |