diff --git a/test/runner.rb b/test/runner.rb index d8b44644f7..263df1d930 100644 --- 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 diff --git a/test/colors b/tool/colors similarity index 100% rename from test/colors rename to tool/colors diff --git a/test/lib/-test-/integer.rb b/tool/lib/-test-/integer.rb similarity index 100% rename from test/lib/-test-/integer.rb rename to tool/lib/-test-/integer.rb diff --git a/test/lib/envutil.rb b/tool/lib/envutil.rb similarity index 100% rename from test/lib/envutil.rb rename to tool/lib/envutil.rb diff --git a/test/lib/find_executable.rb b/tool/lib/find_executable.rb similarity index 100% rename from test/lib/find_executable.rb rename to tool/lib/find_executable.rb diff --git a/test/lib/iseq_loader_checker.rb b/tool/lib/iseq_loader_checker.rb similarity index 100% rename from test/lib/iseq_loader_checker.rb rename to tool/lib/iseq_loader_checker.rb diff --git a/test/lib/jit_support.rb b/tool/lib/jit_support.rb similarity index 100% rename from test/lib/jit_support.rb rename to tool/lib/jit_support.rb diff --git a/test/lib/leakchecker.rb b/tool/lib/leakchecker.rb similarity index 100% rename from test/lib/leakchecker.rb rename to tool/lib/leakchecker.rb diff --git a/test/lib/memory_status.rb b/tool/lib/memory_status.rb similarity index 100% rename from test/lib/memory_status.rb rename to tool/lib/memory_status.rb diff --git a/test/lib/minitest/README.txt b/tool/lib/minitest/README.txt similarity index 100% rename from test/lib/minitest/README.txt rename to tool/lib/minitest/README.txt diff --git a/test/lib/minitest/autorun.rb b/tool/lib/minitest/autorun.rb similarity index 100% rename from test/lib/minitest/autorun.rb rename to tool/lib/minitest/autorun.rb diff --git a/test/lib/minitest/benchmark.rb b/tool/lib/minitest/benchmark.rb similarity index 100% rename from test/lib/minitest/benchmark.rb rename to tool/lib/minitest/benchmark.rb diff --git a/test/lib/minitest/mock.rb b/tool/lib/minitest/mock.rb similarity index 100% rename from test/lib/minitest/mock.rb rename to tool/lib/minitest/mock.rb diff --git a/test/lib/minitest/unit.rb b/tool/lib/minitest/unit.rb similarity index 100% rename from test/lib/minitest/unit.rb rename to tool/lib/minitest/unit.rb diff --git a/test/lib/profile_test_all.rb b/tool/lib/profile_test_all.rb similarity index 100% rename from test/lib/profile_test_all.rb rename to tool/lib/profile_test_all.rb diff --git a/test/lib/test/unit.rb b/tool/lib/test/unit.rb similarity index 100% rename from test/lib/test/unit.rb rename to tool/lib/test/unit.rb diff --git a/test/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb similarity index 100% rename from test/lib/test/unit/assertions.rb rename to tool/lib/test/unit/assertions.rb diff --git a/test/lib/test/unit/parallel.rb b/tool/lib/test/unit/parallel.rb similarity index 100% rename from test/lib/test/unit/parallel.rb rename to tool/lib/test/unit/parallel.rb diff --git a/test/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb similarity index 100% rename from test/lib/test/unit/testcase.rb rename to tool/lib/test/unit/testcase.rb diff --git a/test/lib/tracepointchecker.rb b/tool/lib/tracepointchecker.rb similarity index 100% rename from test/lib/tracepointchecker.rb rename to tool/lib/tracepointchecker.rb diff --git a/test/lib/with_different_ofs.rb b/tool/lib/with_different_ofs.rb similarity index 100% rename from test/lib/with_different_ofs.rb rename to tool/lib/with_different_ofs.rb diff --git a/test/lib/zombie_hunter.rb b/tool/lib/zombie_hunter.rb similarity index 100% rename from test/lib/zombie_hunter.rb rename to tool/lib/zombie_hunter.rb