mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/test/unit.rb: Fix merging miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a790bd0bd7
commit
06aeddaf92
2 changed files with 8 additions and 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,
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue