diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
commit | 2e4f0af00f85ca228bcf5fa919882359411c652a (patch) | |
tree | 6317ef3d0c352a8d7496139f34277e224fe3d4ac /lib/rubygems/test_case.rb | |
parent | 7b14512bee222bdb6392e865b00ef4b4c42b9364 (diff) |
* ext/json/*, test/json/*: Reverted r50231. Because it's not works with
cross-compile environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/test_case.rb')
-rw-r--r-- | lib/rubygems/test_case.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index a116b6c93c..306edcc3f6 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -21,16 +21,7 @@ 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' - begin - gem 'json' - rescue Gem::LoadError - # for Ruby 2.3.0 - end -end - -begin - require 'json' -rescue LoadError + gem 'json' end require 'minitest/autorun' |