From 1cb21311533825d567c8c574d2311dbf4b0f14ff Mon Sep 17 00:00:00 2001 From: hsbt Date: Sun, 12 Apr 2015 05:53:30 +0000 Subject: * lib/rubygems/test_case.rb: fixed json load error for rubygems tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/rubygems/test_case.rb | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4e864785f..a54d7a4b81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Apr 12 14:53:23 2015 SHIBATA Hiroshi + + * lib/rubygems/test_case.rb: fixed json load error for rubygems tests. + Sun Apr 12 14:13:28 2015 SHIBATA Hiroshi * gc.c: Document require name for ObjectSpace methods. diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index b1aabb658d..85a159f938 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -21,12 +21,10 @@ end # 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' -- cgit v1.2.3