naruse	2013-11-22 11:06:23 +0900 (Fri, 22 Nov 2013)

  New Revision: 43772

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

  Log:
    don't call gem method if Test::Unit is defined
    
    ruby's test-all may define 'gem' method somewhere,
    and it cause test failure.

  Modified files:
    trunk/lib/rdoc/test_case.rb
Index: lib/rdoc/test_case.rb
===================================================================
--- lib/rdoc/test_case.rb	(revision 43771)
+++ lib/rdoc/test_case.rb	(revision 43772)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/test_case.rb#L1
 require 'rubygems'
 
 begin
-  gem 'minitest', '~> 4.0'
+  gem 'minitest', '~> 4.0' unless defined?(Test::Unit)
 rescue NoMethodError
   # for ruby tests
 end

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