From 9cf06279443ae08fe23e7f7a4b8303f343a4d57a Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Oct 2009 09:04:16 +0000
Subject: [PATCH] * test/rake/test_fileutils.rb (Rake::TestFileUtils#test_sh):
 uses   FileUtils::RUBY instead of fixed "ruby" so that the ruby command  
 works fine in Ruby's "make test-all".  
 (test_sh_with_a_single_string_argument): ditto.  
 (test_sh_with_multiple_arguments): ditto.   (test_sh_failure): ditto  
 (test_sh_special_handling): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   | 10 ++++++++++
 test/rake/test_fileutils.rb | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c4314ba59..27902de19a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Oct 17 17:56:58 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/rake/test_fileutils.rb (Rake::TestFileUtils#test_sh): uses
+	  FileUtils::RUBY instead of fixed "ruby" so that the ruby command
+	  works fine in Ruby's "make test-all".
+	  (test_sh_with_a_single_string_argument): ditto.
+	  (test_sh_with_multiple_arguments): ditto.
+	  (test_sh_failure): ditto
+	  (test_sh_special_handling): ditto.
+
 Sat Oct 17 17:30:06 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* bignum.c (big_split): fix off-by-one error.  [ruby-dev:39501]
diff --git a/test/rake/test_fileutils.rb b/test/rake/test_fileutils.rb
index 5969d22455..1664ec80c3 100644
--- a/test/rake/test_fileutils.rb
+++ b/test/rake/test_fileutils.rb
@@ -132,7 +132,7 @@ class Rake::TestFileUtils < Test::Unit::TestCase
   end
 
   def test_sh
-    verbose(false) { sh %{ruby #{ShellCommand}} }
+    verbose(false) { sh %{#{RUBY} #{ShellCommand}} }
     assert true, "should not fail"
   end
 
@@ -153,32 +153,32 @@ class Rake::TestFileUtils < Test::Unit::TestCase
   def test_sh_with_a_single_string_argument
     ENV['RAKE_TEST_SH'] = 'someval'
     verbose(false) {
-      sh %{ruby #{BASEDIR}/check_expansion.rb #{env_var} someval}
+      sh %{#{RUBY} #{BASEDIR}/check_expansion.rb #{env_var} someval}
     }
   end
 
   def test_sh_with_multiple_arguments
     ENV['RAKE_TEST_SH'] = 'someval'
     verbose(false) {
-      Sh.run 'ruby', File.expand_path('../check_no_expansion.rb', __FILE__), env_var, 'someval'
+      Sh.run RUBY, File.expand_path('../check_no_expansion.rb', __FILE__), env_var, 'someval'
     }
   end
 
   def test_sh_failure
     assert_raise(RuntimeError) { 
-      verbose(false) { Sh.run "ruby #{File.expand_path('../shellcommand.rb', __FILE__)} 1" }
+      verbose(false) { Sh.run "#{RUBY} #{File.expand_path('../shellcommand.rb', __FILE__)} 1" }
     }
   end
 
   def test_sh_special_handling
     count = 0
     verbose(false) {
-      sh(%{ruby #{ShellCommand}}) do |ok, res|
+      sh(%{#{RUBY} #{ShellCommand}}) do |ok, res|
         assert(ok)
         assert_equal 0, res.exitstatus
         count += 1
       end
-      sh(%{ruby #{ShellCommand} 1}) do |ok, res|
+      sh(%{#{RUBY} #{ShellCommand} 1}) do |ok, res|
         assert(!ok)
         assert_equal 1, res.exitstatus
         count += 1