summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 05:35:05 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 05:35:05 +0000
commit06aeddaf926a38c6ff436988b6ed373a00fb23df (patch)
treef9340633a249511d895e27ea2137c92b00beee33 /lib
parenta790bd0bd775927583ff5502b4ccd54e6cfb0706 (diff)
* lib/test/unit.rb: Fix merging miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index d182f2ff16..d6d2c1056a 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -218,7 +218,6 @@ module Test
class Runner < MiniTest::Unit
include Test::Unit::Options
- include Test::Unit::RequireFiles
include Test::Unit::GlobOption
include Test::Unit::LoadPathOption
include Test::Unit::GCStressOption
@@ -521,6 +520,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)