* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).

  [Bug #4700]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 8 deletions

diff --git a/test/json/test_json_fixtures.rb b/test/json/test_json_fixtures.rb
index 95e57ebfdc..e9df8f5b1c 100755
--- a/test/json/test_json_fixtures.rb
+++ b/test/json/test_json_fixtures.rb
@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONFixtures < Test::Unit::TestCase
   def setup
@@ -18,15 +14,20 @@ class TC_JSONFixtures < Test::Unit::TestCase
 
   def test_passing
     for name, source in @passed
-      assert JSON.parse(source),
-        "Did not pass for fixture '#{name}'"
+      begin
+        assert JSON.parse(source),
+          "Did not pass for fixture '#{name}': #{source.inspect}"
+      rescue => e
+        warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
+        raise e
+      end
     end
   end
 
   def test_failing
     for name, source in @failed
       assert_raises(JSON::ParserError, JSON::NestingError,
-        "Did not fail for fixture '#{name}'") do
+        "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end