diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/test/unit.rb | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Feb 22 14:34:26 2011 Shota Fukumori (sora_h) <sorah@tubusu.net> + + * lib/test/unit.rb: Fix merging miss. + Tue Feb 22 12:27:26 2011 Shota Fukumori (sora_h) <sorah@tubusu.net> * 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) |