ruby-changes:20749
From: drbrain <ko1@a...>
Date: Mon, 1 Aug 2011 15:45:54 +0900 (JST)
Subject: [ruby-changes:20749] drbrain:r32797 (trunk): * test/rake/test_rake_functional.rb: Don't assume the binary name of
drbrain 2011-08-01 15:45:43 +0900 (Mon, 01 Aug 2011) New Revision: 32797 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32797 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: trunk/ChangeLog trunk/test/rake/helper.rb trunk/test/rake/test_rake_functional.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 32796) +++ ChangeLog (revision 32797) @@ -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 15:31:14 2011 URABE Shyouhei <shyouhei@r...> * test/io/console/test_io_console.rb (TestIO_Console#test_sync): Index: test/rake/test_rake_functional.rb =================================================================== --- test/rake/test_rake_functional.rb (revision 32796) +++ test/rake/test_rake_functional.rb (revision 32797) @@ -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: test/rake/helper.rb =================================================================== --- test/rake/helper.rb (revision 32796) +++ test/rake/helper.rb (revision 32797) @@ -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/