From cfaddc2a3248dd0ce4a370fdbab44ca88adf5722 Mon Sep 17 00:00:00 2001 From: hsbt Date: Sat, 11 Apr 2015 11:14:36 +0000 Subject: * ext/json/*, test/json/*, defs/default_gems: Gemify JSON library. [fix GH-867][Feature #11057] * test/ruby/test_extlibs.rb: removed json gem from existence extentions. * gems/bundled_gems: added json gem into bundled gem. * lib/rdoc/rubygems_hook.rb: ignored no json environment. * lib/rubygems/test_case.rb, test/rubygems/*: ditto. * lib/rdoc/test_case.rb, test/rdoc/*: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/test_case.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/rdoc/test_case.rb') diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb index 4989516b7a..3b2c181201 100644 --- a/lib/rdoc/test_case.rb +++ b/lib/rdoc/test_case.rb @@ -6,6 +6,11 @@ rescue NoMethodError, Gem::LoadError # for ruby tests end +begin + require 'json' +rescue LoadError +end + require 'minitest/autorun' require 'minitest/benchmark' if ENV['BENCHMARK'] @@ -214,4 +219,3 @@ $LOAD_PATH.each do |load_path| break if load_path[0] == ?/ load_path.replace File.expand_path load_path end if RUBY_VERSION < '1.9' - -- cgit v1.2.3