Fixed broken runner for `make test-all`

1 files changed, 3 insertions, 8 deletions

diff --git a/tool/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb
index b913621fc3..cbcfb4358c 100644
--- a/tool/lib/test/unit/testcase.rb
+++ b/tool/lib/test/unit/testcase.rb
@@ -3,8 +3,6 @@ require 'test/unit/assertions'
 
 module Test
   module Unit
-    # remove silly TestCase class
-    remove_const(:TestCase) if defined?(self::TestCase)
 
     ##
     # Provides a simple set of guards that you can use in your tests
@@ -163,6 +161,8 @@ module Test
       # Runs the tests reporting the status to +runner+
 
       def run runner
+        @options = runner.options
+
         trap "INFO" do
           runner.report.each_with_index do |msg, i|
             warn "\n%3d) %s" % [i + 1, msg]
@@ -191,7 +191,7 @@ module Test
         rescue *PASSTHROUGH_EXCEPTIONS
           raise
         rescue Exception => e
-          @passed = Skip === e
+          @passed = MiniTest::Skip === e
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, e
           result = runner.puke self.class, self.__name__, e
@@ -337,11 +337,6 @@ module Test
         false
       end
 
-      def run runner
-        @options = runner.options
-        super runner
-      end
-
       def self.method_added(name)
         super
         return unless name.to_s.start_with?("test_")