summaryrefslogtreecommitdiff
path: root/test/json
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-07-01 18:50:39 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-07-01 18:50:39 +0900
commit0aac138e0b507c8a361f7cf2f30c276e7110ea33 (patch)
tree2e3d371ff918c8d6588cd69b4e3afb4be2ecd5de /test/json
parent26041da2fbca4cfeffaee13b66f90310d5d72e18 (diff)
downloadruby-0aac138e0b507c8a361f7cf2f30c276e7110ea33.tar.gz
Merge json-2.3.1 from flori/json
Diffstat (limited to 'test/json')
-rw-r--r--test/json/test_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/json/test_helper.rb b/test/json/test_helper.rb
index 446c020e8f..c5ec0fca7b 100644
--- a/test/json/test_helper.rb
+++ b/test/json/test_helper.rb
@@ -1,12 +1,12 @@
case ENV['JSON']
when 'pure'
- $:.unshift File.join(__dir__, '../lib')
+ $:.unshift 'lib'
require 'json/pure'
when 'ext'
- $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+ $:.unshift 'ext', 'lib'
require 'json/ext'
else
- $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+ $:.unshift 'ext', 'lib'
require 'json'
end