summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/runner.rb13
-rw-r--r--tool/colors (renamed from test/colors)0
-rw-r--r--tool/lib/-test-/integer.rb (renamed from test/lib/-test-/integer.rb)0
-rw-r--r--tool/lib/envutil.rb (renamed from test/lib/envutil.rb)0
-rw-r--r--tool/lib/find_executable.rb (renamed from test/lib/find_executable.rb)0
-rw-r--r--tool/lib/iseq_loader_checker.rb (renamed from test/lib/iseq_loader_checker.rb)0
-rw-r--r--tool/lib/jit_support.rb (renamed from test/lib/jit_support.rb)0
-rw-r--r--tool/lib/leakchecker.rb (renamed from test/lib/leakchecker.rb)0
-rw-r--r--tool/lib/memory_status.rb (renamed from test/lib/memory_status.rb)0
-rw-r--r--tool/lib/minitest/README.txt (renamed from test/lib/minitest/README.txt)0
-rw-r--r--tool/lib/minitest/autorun.rb (renamed from test/lib/minitest/autorun.rb)0
-rw-r--r--tool/lib/minitest/benchmark.rb (renamed from test/lib/minitest/benchmark.rb)0
-rw-r--r--tool/lib/minitest/mock.rb (renamed from test/lib/minitest/mock.rb)0
-rw-r--r--tool/lib/minitest/unit.rb (renamed from test/lib/minitest/unit.rb)0
-rw-r--r--tool/lib/profile_test_all.rb (renamed from test/lib/profile_test_all.rb)0
-rw-r--r--tool/lib/test/unit.rb (renamed from test/lib/test/unit.rb)0
-rw-r--r--tool/lib/test/unit/assertions.rb (renamed from test/lib/test/unit/assertions.rb)0
-rw-r--r--tool/lib/test/unit/parallel.rb (renamed from test/lib/test/unit/parallel.rb)0
-rw-r--r--tool/lib/test/unit/testcase.rb (renamed from test/lib/test/unit/testcase.rb)0
-rw-r--r--tool/lib/tracepointchecker.rb (renamed from test/lib/tracepointchecker.rb)0
-rw-r--r--tool/lib/with_different_ofs.rb (renamed from test/lib/with_different_ofs.rb)0
-rw-r--r--tool/lib/zombie_hunter.rb (renamed from test/lib/zombie_hunter.rb)0
22 files changed, 7 insertions, 6 deletions
diff --git a/test/runner.rb b/test/runner.rb
index d8b44644f74..263df1d930b 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
index a65c326ade4..a65c326ade4 100644
--- a/test/colors
+++ b/tool/colors
diff --git a/test/lib/-test-/integer.rb b/tool/lib/-test-/integer.rb
index a224148f24e..a224148f24e 100644
--- a/test/lib/-test-/integer.rb
+++ b/tool/lib/-test-/integer.rb
diff --git a/test/lib/envutil.rb b/tool/lib/envutil.rb
index b4eb63da90b..b4eb63da90b 100644
--- a/test/lib/envutil.rb
+++ b/tool/lib/envutil.rb
diff --git a/test/lib/find_executable.rb b/tool/lib/find_executable.rb
index 89c6fb8f3b7..89c6fb8f3b7 100644
--- a/test/lib/find_executable.rb
+++ b/tool/lib/find_executable.rb
diff --git a/test/lib/iseq_loader_checker.rb b/tool/lib/iseq_loader_checker.rb
index 1a1a694834d..1a1a694834d 100644
--- a/test/lib/iseq_loader_checker.rb
+++ b/tool/lib/iseq_loader_checker.rb
diff --git a/test/lib/jit_support.rb b/tool/lib/jit_support.rb
index c1624cc3b2b..c1624cc3b2b 100644
--- a/test/lib/jit_support.rb
+++ b/tool/lib/jit_support.rb
diff --git a/test/lib/leakchecker.rb b/tool/lib/leakchecker.rb
index af9200bf77a..af9200bf77a 100644
--- a/test/lib/leakchecker.rb
+++ b/tool/lib/leakchecker.rb
diff --git a/test/lib/memory_status.rb b/tool/lib/memory_status.rb
index ad002b2dda5..ad002b2dda5 100644
--- a/test/lib/memory_status.rb
+++ b/tool/lib/memory_status.rb
diff --git a/test/lib/minitest/README.txt b/tool/lib/minitest/README.txt
index 368cc3aa4eb..368cc3aa4eb 100644
--- a/test/lib/minitest/README.txt
+++ b/tool/lib/minitest/README.txt
diff --git a/test/lib/minitest/autorun.rb b/tool/lib/minitest/autorun.rb
index 844096623c0..844096623c0 100644
--- a/test/lib/minitest/autorun.rb
+++ b/tool/lib/minitest/autorun.rb
diff --git a/test/lib/minitest/benchmark.rb b/tool/lib/minitest/benchmark.rb
index b3f2bc28b30..b3f2bc28b30 100644
--- a/test/lib/minitest/benchmark.rb
+++ b/tool/lib/minitest/benchmark.rb
diff --git a/test/lib/minitest/mock.rb b/tool/lib/minitest/mock.rb
index 224b06cb89f..224b06cb89f 100644
--- a/test/lib/minitest/mock.rb
+++ b/tool/lib/minitest/mock.rb
diff --git a/test/lib/minitest/unit.rb b/tool/lib/minitest/unit.rb
index d922a5fc412..d922a5fc412 100644
--- a/test/lib/minitest/unit.rb
+++ b/tool/lib/minitest/unit.rb
diff --git a/test/lib/profile_test_all.rb b/tool/lib/profile_test_all.rb
index 2c360d76ddc..2c360d76ddc 100644
--- a/test/lib/profile_test_all.rb
+++ b/tool/lib/profile_test_all.rb
diff --git a/test/lib/test/unit.rb b/tool/lib/test/unit.rb
index 3df6774d61f..3df6774d61f 100644
--- a/test/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
diff --git a/test/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb
index 169a3dcc7e0..169a3dcc7e0 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/tool/lib/test/unit/assertions.rb
diff --git a/test/lib/test/unit/parallel.rb b/tool/lib/test/unit/parallel.rb
index d851326acab..d851326acab 100644
--- a/test/lib/test/unit/parallel.rb
+++ b/tool/lib/test/unit/parallel.rb
diff --git a/test/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb
index 58cfbcab99e..58cfbcab99e 100644
--- a/test/lib/test/unit/testcase.rb
+++ b/tool/lib/test/unit/testcase.rb
diff --git a/test/lib/tracepointchecker.rb b/tool/lib/tracepointchecker.rb
index 47822ecef54..47822ecef54 100644
--- a/test/lib/tracepointchecker.rb
+++ b/tool/lib/tracepointchecker.rb
diff --git a/test/lib/with_different_ofs.rb b/tool/lib/with_different_ofs.rb
index 559ed6a1d12..559ed6a1d12 100644
--- a/test/lib/with_different_ofs.rb
+++ b/tool/lib/with_different_ofs.rb
diff --git a/test/lib/zombie_hunter.rb b/tool/lib/zombie_hunter.rb
index 33bc4679412..33bc4679412 100644
--- a/test/lib/zombie_hunter.rb
+++ b/tool/lib/zombie_hunter.rb