* lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]

* test/testunit/test_rake_integration.rb: adding an integration test
  with the rake loader to prevent regressions.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index fd50d8100d..76e9fddf95 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -186,8 +186,6 @@ module Test
     end
 
     class Runner < MiniTest::Unit
-      include Test::Unit::Options
-      include Test::Unit::RequireFiles
       include Test::Unit::GlobOption
       include Test::Unit::LoadPathOption
       include Test::Unit::GCStressOption
@@ -225,6 +223,10 @@ module Test
     end
 
     class AutoRunner
+      class Runner < Test::Unit::Runner
+        include Test::Unit::RequireFiles
+      end
+
       attr_accessor :to_run, :options
 
       def initialize(force_standalone = false, default_dir = nil, argv = ARGV)