drbrain	2011-08-01 15:47:00 +0900 (Mon, 01 Aug 2011)

  New Revision: 32798

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

  Log:
    * test/rake/test_rake_functional.rb:  Don't assume the binary name of
      ruby is "ruby".  [Ruby 1.9 - Bug #5114]
    * test/rake/helper.rb:  ditto

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/rake/helper.rb
    branches/ruby_1_9_3/test/rake/test_rake_functional.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32797)
+++ ruby_1_9_3/ChangeLog	(revision 32798)
@@ -1,3 +1,9 @@
+Mon Aug 01 15:45:23 2011  Eric Hodel  <drbrain@s...>
+
+	* test/rake/test_rake_functional.rb:  Don't assume the binary name of
+	  ruby is "ruby".  [Ruby 1.9 - Bug #5114]
+	* test/rake/helper.rb:  ditto
+
 Mon Aug  1 05:21:42 2011  TAKANO Mitsuhiro (takano32)  <tak@n...>
 
 	* cont.c (cont_save_thread): fix missing semicolon.
Index: ruby_1_9_3/test/rake/test_rake_functional.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 32797)
+++ ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 32798)
@@ -174,7 +174,7 @@
 
     rake "inline_verbose_default"
 
-    assert_match(/ruby -e/, @err)
+    assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_inline_verbose_true_should_show_command
@@ -182,7 +182,7 @@
 
     rake "inline_verbose_true"
 
-    assert_match(/ruby -e/, @err)
+    assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_inline_verbose_false_should_not_show_command
@@ -190,7 +190,7 @@
 
     rake "inline_verbose_false"
 
-    refute_match(/ruby -e/, @err)
+    refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_block_verbose_false_should_not_show_command
@@ -198,7 +198,7 @@
 
     rake "block_verbose_false"
 
-    refute_match(/ruby -e/, @err)
+    refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_block_verbose_true_should_show_command
@@ -206,7 +206,7 @@
 
     rake "block_verbose_true"
 
-    assert_match(/ruby -e/, @err)
+    assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_standalone_verbose_true_should_show_command
@@ -214,7 +214,7 @@
 
     rake "standalone_verbose_true"
 
-    assert_match(/ruby -e/, @err)
+    assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_standalone_verbose_false_should_not_show_command
@@ -222,7 +222,7 @@
 
     rake "standalone_verbose_false"
 
-    refute_match(/ruby -e/, @err)
+    refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
   end
 
   def test_dry_run
Index: ruby_1_9_3/test/rake/helper.rb
===================================================================
--- ruby_1_9_3/test/rake/helper.rb	(revision 32797)
+++ ruby_1_9_3/test/rake/helper.rb	(revision 32798)
@@ -455,35 +455,35 @@
     rakefile <<-VERBOSE
 task :standalone_verbose_true do
   verbose true
-  sh "ruby -e '0'"
+  sh "#{RUBY} -e '0'"
 end
 
 task :standalone_verbose_false do
   verbose false
-  sh "ruby -e '0'"
+  sh "#{RUBY} -e '0'"
 end
 
 task :inline_verbose_default do
-  sh "ruby -e '0'"
+  sh "#{RUBY} -e '0'"
 end
 
 task :inline_verbose_false do
-  sh "ruby -e '0'", :verbose => false
+  sh "#{RUBY} -e '0'", :verbose => false
 end
 
 task :inline_verbose_true do
-  sh "ruby -e '0'", :verbose => true
+  sh "#{RUBY} -e '0'", :verbose => true
 end
 
 task :block_verbose_true do
   verbose(true) do
-    sh "ruby -e '0'"
+    sh "#{RUBY} -e '0'"
   end
 end
 
 task :block_verbose_false do
   verbose(false) do
-    sh "ruby -e '0'"
+    sh "#{RUBY} -e '0'"
   end
 end
     VERBOSE

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