From 5caef67a6f19e5c03cc4684532d738e02a694015 Mon Sep 17 00:00:00 2001 From: drbrain Date: Fri, 12 Aug 2011 16:56:48 +0000 Subject: * lib/rake: Update to Rake 0.9.2.2. Prevent pollution of toplevel namespace by Commands. Remove unused variable and debugging statement in tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rake/helper.rb | 1 - test/rake/test_rake_dsl.rb | 4 ++++ test/rake/test_rake_functional.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'test/rake') diff --git a/test/rake/helper.rb b/test/rake/helper.rb index 636c31b266..65443fc111 100644 --- a/test/rake/helper.rb +++ b/test/rake/helper.rb @@ -282,7 +282,6 @@ end task :prep => :clean do mkdir_p 'src' N.times do |n| - puts "DBG: Touching src/foo#{n}" touch "src/foo#{n}" end end diff --git a/test/rake/test_rake_dsl.rb b/test/rake/test_rake_dsl.rb index 294ff2bd0d..de83b89ab4 100644 --- a/test/rake/test_rake_dsl.rb +++ b/test/rake/test_rake_dsl.rb @@ -56,6 +56,10 @@ class TestRakeDsl < Rake::TestCase assert_match(/test_rake_dsl\.rb:\d+/, err) end + def test_no_commands_constant + assert ! defined?(Commands), "should not define Commands" + end + def test_deprecated_object_dsl_with_suppressed_warnings Rake.application.options.ignore_deprecate = true out, err = capture_io do diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb index 95a36e1ad9..3764709f38 100644 --- a/test/rake/test_rake_functional.rb +++ b/test/rake/test_rake_functional.rb @@ -436,7 +436,7 @@ class TestRakeFunctional < Rake::TestCase 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 = Open3.popen3(Gem.ruby, *option_list) inn.close @out = out.read -- cgit v1.2.3