Move to tool/lib from test/lib.

2022-11-09 12:17:21 -05:00 · 2019-06-29 19:43:47 +09:00 · 2019-06-29 19:43:47 +09:00 · c3c0e3f5c9
commit c3c0e3f5c9
parent 142617c8e1
22 changed files with 7 additions and 6 deletions
--- a/test/runner.rb
+++ b/test/runner.rb
@ -3,7 +3,8 @@ require 'rbconfig'

 src_testdir = File.dirname(File.realpath(__FILE__))
 $LOAD_PATH << src_testdir
-$LOAD_PATH.unshift "#{src_testdir}/lib"
+tool_dir = File.join src_testdir, "..", "tool"
+$LOAD_PATH.unshift "#{tool_dir}/lib"

 # Get bundled gems on load path
 Dir.glob("#{src_testdir}/../gems/*/*.gemspec")
@ -20,13 +21,13 @@ end

 ENV["GEM_SKIP"] = ENV["GEM_HOME"] = ENV["GEM_PATH"] = "".freeze

-require_relative 'lib/profile_test_all' if ENV.has_key?('RUBY_TEST_ALL_PROFILE')
-require_relative 'lib/tracepointchecker'
-require_relative 'lib/zombie_hunter'
-require_relative 'lib/iseq_loader_checker'
+require_relative "#{tool_dir}/lib/profile_test_all" if ENV.has_key?('RUBY_TEST_ALL_PROFILE')
+require_relative "#{tool_dir}/lib/tracepointchecker"
+require_relative "#{tool_dir}/lib/zombie_hunter"
+require_relative "#{tool_dir}/lib/iseq_loader_checker"

 if ENV['COVERAGE']
-  require_relative "../tool/test-coverage.rb"
+  require_relative "#{tool_dir}/lib/test-coverage.rb"
 end

 begin
--- a/tool/colors
+++ b/tool/colors
--- a/tool/lib/-test-/integer.rb
+++ b/tool/lib/-test-/integer.rb
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
--- a/tool/lib/find_executable.rb
+++ b/tool/lib/find_executable.rb
--- a/tool/lib/iseq_loader_checker.rb
+++ b/tool/lib/iseq_loader_checker.rb
--- a/tool/lib/jit_support.rb
+++ b/tool/lib/jit_support.rb
--- a/tool/lib/leakchecker.rb
+++ b/tool/lib/leakchecker.rb
--- a/tool/lib/memory_status.rb
+++ b/tool/lib/memory_status.rb
--- a/tool/lib/minitest/README.txt
+++ b/tool/lib/minitest/README.txt
--- a/tool/lib/minitest/autorun.rb
+++ b/tool/lib/minitest/autorun.rb
--- a/tool/lib/minitest/benchmark.rb
+++ b/tool/lib/minitest/benchmark.rb
--- a/tool/lib/minitest/mock.rb
+++ b/tool/lib/minitest/mock.rb
--- a/tool/lib/minitest/unit.rb
+++ b/tool/lib/minitest/unit.rb
--- a/tool/lib/profile_test_all.rb
+++ b/tool/lib/profile_test_all.rb
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
--- a/tool/lib/test/unit/assertions.rb
+++ b/tool/lib/test/unit/assertions.rb
--- a/tool/lib/test/unit/parallel.rb
+++ b/tool/lib/test/unit/parallel.rb
--- a/tool/lib/test/unit/testcase.rb
+++ b/tool/lib/test/unit/testcase.rb
--- a/tool/lib/tracepointchecker.rb
+++ b/tool/lib/tracepointchecker.rb
--- a/tool/lib/with_different_ofs.rb
+++ b/tool/lib/with_different_ofs.rb
--- a/tool/lib/zombie_hunter.rb
+++ b/tool/lib/zombie_hunter.rb