diff options
-rw-r--r-- | test/json/test_helper.rb | 6 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/test/json/test_helper.rb b/test/json/test_helper.rb index c5ec0fca7b..446c020e8f 100644 --- a/test/json/test_helper.rb +++ b/test/json/test_helper.rb @@ -1,12 +1,12 @@ case ENV['JSON'] when 'pure' - $:.unshift 'lib' + $:.unshift File.join(__dir__, '../lib') require 'json/pure' when 'ext' - $:.unshift 'ext', 'lib' + $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib') require 'json/ext' else - $:.unshift 'ext', 'lib' + $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib') require 'json' end diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index fee38357d7..2c6dc3f8f5 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -311,16 +311,6 @@ class TestM17N < Test::Unit::TestCase "abc".encode(Encoding.default_external) end - # debugging code for http://ci.rvm.jp/logfiles/brlog.trunk-test-random.20200322-221411 - begin - "abc".encode(Encoding.default_external) - rescue Encoding::CompatibilityError - TracePoint.new(:raise) do |tp| - Process.kill(:SEGV, $$) - end.enable { "abc".encode(Encoding.default_external) } - end - # debugging code end - assert_equal '[abc]', [o].inspect Encoding.default_external = Encoding::US_ASCII |