Revert r32944 and r33092.

Those commits break tests on Windows and no response.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 2 insertions, 5 deletions

diff --git a/test/rake/helper.rb b/test/rake/helper.rb
index 65443fc111..636c31b266 100644
--- a/test/rake/helper.rb
+++ b/test/rake/helper.rb
@@ -282,6 +282,7 @@ 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 de83b89ab4..294ff2bd0d 100644
--- a/test/rake/test_rake_dsl.rb
+++ b/test/rake/test_rake_dsl.rb
@@ -56,10 +56,6 @@ 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 3764709f38..95a36e1ad9 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 = Open3.popen3(Gem.ruby, *option_list)
+    inn, out, err, wait = Open3.popen3(Gem.ruby, *option_list)
     inn.close
 
     @out = out.read