hsbt	2015-04-12 14:53:30 +0900 (Sun, 12 Apr 2015)

  New Revision: 50260

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

  Log:
    * lib/rubygems/test_case.rb: fixed json load error for rubygems tests.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/test_case.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50259)
+++ ChangeLog	(revision 50260)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr 12 14:53:23 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* lib/rubygems/test_case.rb: fixed json load error for rubygems tests.
+
 Sun Apr 12 14:13:28 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* gc.c: Document require name for ObjectSpace methods.
Index: lib/rubygems/test_case.rb
===================================================================
--- lib/rubygems/test_case.rb	(revision 50259)
+++ lib/rubygems/test_case.rb	(revision 50260)
@@ -21,12 +21,10 @@ end https://github.com/ruby/ruby/blob/trunk/lib/rubygems/test_case.rb#L21
 # them while we're testing rubygems, and thus we can't actually load them.
 unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
   gem 'rdoc'
-  gem 'json'
-end
-
-begin
-  require 'json'
-rescue LoadError
+  begin
+    gem 'json'
+  rescue LoadError
+  end
 end
 
 require 'minitest/autorun'

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