diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/rake/helper.rb | 14 | ||||
-rw-r--r-- | test/rake/test_rake_functional.rb | 14 |
3 files changed, 20 insertions, 14 deletions
@@ -1,3 +1,9 @@ +Mon Aug 01 15:45:23 2011 Eric Hodel <drbrain@segment7.net> + + * 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@ruby-lang.org> * test/io/console/test_io_console.rb (TestIO_Console#test_sync): diff --git a/test/rake/helper.rb b/test/rake/helper.rb index 4d8c8185bd..636c31b266 100644 --- a/test/rake/helper.rb +++ b/test/rake/helper.rb @@ -455,35 +455,35 @@ end 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 diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb index bfa9375a39..95a36e1ad9 100644 --- a/test/rake/test_rake_functional.rb +++ b/test/rake/test_rake_functional.rb @@ -174,7 +174,7 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase 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 @@ class TestRakeFunctional < Rake::TestCase rake "standalone_verbose_false" - refute_match(/ruby -e/, @err) + refute_match(/#{Regexp.quote(RUBY)} -e/, @err) end def test_dry_run |