From d98d3fe12a46203b056c23f50d845028e3a73a7a Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Jul 2010 13:09:44 +0000
Subject: * lib/test/unit.rb, bin/testrb, test/runner.rb: revert r28655, which 
  broke test-all.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/test/unit.rb | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

(limited to 'lib/test')

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b518426893..4aecc49450 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -9,21 +9,7 @@ module Test
   module Unit
     TEST_UNIT_IMPLEMENTATION = 'test/unit compatibility layer using minitest'
 
-    @@installed_at_exit = true
-    @@run_count = 0
-
-    RunCount = Module.new do
-      def run(*)
-        @@run_count += 1
-        super
-      end
-    end
-
-    def self.new(*)
-      super.extend(RunCount)
-    end
-
-    def self.setup_argv(original_argv=::ARGV)
+    def self.setup_argv(original_argv=ARGV)
       minitest_argv = []
       files = []
       reject = []
@@ -81,23 +67,9 @@ module Test
         end
       }
 
-      at_exit {
-        next if @@run_count.nonzero?
-        next if $! # don't run if there was an exception
-        exit false unless run(minitest_argv)
-      } unless @@installed_at_exit
-      @@installed_at_exit = true
-
-      minitest_argv
-    end
-
-    def self.run(args)
-      exit_code = MiniTest::Unit.new.run(args)
-      !exit_code || exit_code == 0
-    end
-
-    def self.start(argv=::ARGV, &block)
-      run(setup_argv(argv, &block))
+      ARGV.replace minitest_argv
     end
   end
 end
+
+MiniTest::Unit.autorun
-- 
cgit v1.2.3