drbrain	2012-12-06 16:35:45 +0900 (Thu, 06 Dec 2012)

  New Revision: 38232

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38232

  Log:
    * 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

  Modified files:
    trunk/ChangeLog
    trunk/lib/rake/file_utils.rb
    trunk/test/rake/helper.rb
    trunk/test/rake/test_rake_functional.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38231)
+++ ChangeLog	(revision 38232)
@@ -1,3 +1,10 @@
+Thu Dec  6 16:35:21 2012  Eric Hodel  <drbrain@s...>
+
+	* 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@s...>
 
 	* lib/rdoc/context.rb:  Don't warn for duplicate methods while loading.
Index: lib/rake/file_utils.rb
===================================================================
--- lib/rake/file_utils.rb	(revision 38231)
+++ lib/rake/file_utils.rb	(revision 38232)
@@ -6,7 +6,7 @@
 # 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, '"\&"')
Index: test/rake/test_rake_functional.rb
===================================================================
--- test/rake/test_rake_functional.rb	(revision 38231)
+++ test/rake/test_rake_functional.rb	(revision 38232)
@@ -471,7 +471,7 @@
   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
Index: test/rake/helper.rb
===================================================================
--- test/rake/helper.rb	(revision 38231)
+++ test/rake/helper.rb	(revision 38232)
@@ -12,8 +12,8 @@
 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 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/