summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-15 15:35:58 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-15 15:35:58 +0000
commit24addf1f1d0dbb656efd60fe2f4f688984684d23 (patch)
treef7ed84fc7774105a027abc84c0fec5cf0dfe48a4 /test
parentc3ae81e1a3374bf5094f877b32149cfcdaf928b2 (diff)
Revert r33276.
These changes are not the cause of Windows test failures. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rake/helper.rb1
-rw-r--r--test/rake/test_rake_dsl.rb4
-rw-r--r--test/rake/test_rake_functional.rb2
3 files changed, 5 insertions, 2 deletions
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