From 06aeddaf926a38c6ff436988b6ed373a00fb23df Mon Sep 17 00:00:00 2001 From: sorah Date: Tue, 22 Feb 2011 05:35:05 +0000 Subject: [PATCH] * lib/test/unit.rb: Fix merging miss. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/test/unit.rb | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea4b6da606..af2ecc88cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 22 14:34:26 2011 Shota Fukumori (sora_h) + + * lib/test/unit.rb: Fix merging miss. + Tue Feb 22 12:27:26 2011 Shota Fukumori (sora_h) * lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status, 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)