sorah	2011-02-22 14:35:05 +0900 (Tue, 22 Feb 2011)

  New Revision: 30940

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30940

  Log:
    * lib/test/unit.rb: Fix merging miss.

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30939)
+++ ChangeLog	(revision 30940)
@@ -1,3 +1,7 @@
+Tue Feb 22 14:34:26 2011  Shota Fukumori (sora_h) <sorah@t...>
+
+	* lib/test/unit.rb: Fix merging miss.
+
 Tue Feb 22 12:27:26 2011  Shota Fukumori (sora_h) <sorah@t...>
 
 	* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 30939)
+++ lib/test/unit.rb	(revision 30940)
@@ -218,7 +218,6 @@
 
     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 @@
     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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/