From c68781e9181cb43af1bac29b3c974887205c3bf3 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 1 Jul 2019 21:05:55 +0900
Subject: [PATCH] Split test files for test-framework that are test-unit and
 minitest to tool direcotry.

---
 common.mk                                                      | 3 ++-
 {test => tool/test}/minitest/metametameta.rb                   | 0
 {test => tool/test}/minitest/test_minitest_benchmark.rb        | 0
 {test => tool/test}/minitest/test_minitest_mock.rb             | 0
 {test => tool/test}/minitest/test_minitest_unit.rb             | 0
 {test => tool/test}/testunit/test4test_hideskip.rb             | 2 +-
 {test => tool/test}/testunit/test4test_redefinition.rb         | 2 +-
 {test => tool/test}/testunit/test4test_sorting.rb              | 2 +-
 {test => tool/test}/testunit/test_assertion.rb                 | 0
 {test => tool/test}/testunit/test_hideskip.rb                  | 0
 {test => tool/test}/testunit/test_parallel.rb                  | 2 +-
 {test => tool/test}/testunit/test_redefinition.rb              | 0
 {test => tool/test}/testunit/test_sorting.rb                   | 0
 {test => tool/test}/testunit/tests_for_parallel/ptest_first.rb | 0
 {test => tool/test}/testunit/tests_for_parallel/ptest_forth.rb | 0
 .../test}/testunit/tests_for_parallel/ptest_second.rb          | 0
 {test => tool/test}/testunit/tests_for_parallel/ptest_third.rb | 0
 {test => tool/test}/testunit/tests_for_parallel/runner.rb      | 2 +-
 18 files changed, 7 insertions(+), 6 deletions(-)
 rename {test => tool/test}/minitest/metametameta.rb (100%)
 rename {test => tool/test}/minitest/test_minitest_benchmark.rb (100%)
 rename {test => tool/test}/minitest/test_minitest_mock.rb (100%)
 rename {test => tool/test}/minitest/test_minitest_unit.rb (100%)
 rename {test => tool/test}/testunit/test4test_hideskip.rb (72%)
 rename {test => tool/test}/testunit/test4test_redefinition.rb (79%)
 rename {test => tool/test}/testunit/test4test_sorting.rb (79%)
 rename {test => tool/test}/testunit/test_assertion.rb (100%)
 rename {test => tool/test}/testunit/test_hideskip.rb (100%)
 rename {test => tool/test}/testunit/test_parallel.rb (98%)
 rename {test => tool/test}/testunit/test_redefinition.rb (100%)
 rename {test => tool/test}/testunit/test_sorting.rb (100%)
 rename {test => tool/test}/testunit/tests_for_parallel/ptest_first.rb (100%)
 rename {test => tool/test}/testunit/tests_for_parallel/ptest_forth.rb (100%)
 rename {test => tool/test}/testunit/tests_for_parallel/ptest_second.rb (100%)
 rename {test => tool/test}/testunit/tests_for_parallel/ptest_third.rb (100%)
 rename {test => tool/test}/testunit/tests_for_parallel/runner.rb (80%)

diff --git a/common.mk b/common.mk
index 839354118a..a48e1c8c3f 100755
--- a/common.mk
+++ b/common.mk
@@ -185,6 +185,7 @@ INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644
 
 TESTSDIR      = $(srcdir)/test
+TOOL_TESTSDIR = ${srcdir}/tool/test
 TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
 EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
 TESTWORKDIR   = testwork
@@ -753,7 +754,7 @@ yes-test-knownbug: prog PHONY
 
 test-testframework: $(TEST_RUNNABLE)-test-testframework
 yes-test-testframework: prog PHONY
-	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" --basedir=${TOOL_TESTSDIR} $(TESTOPTS) testunit minitest
 no-test-testframework: PHONY
 
 test-sample: test-basic # backward compatibility for mswin-build
diff --git a/test/minitest/metametameta.rb b/tool/test/minitest/metametameta.rb
similarity index 100%
rename from test/minitest/metametameta.rb
rename to tool/test/minitest/metametameta.rb
diff --git a/test/minitest/test_minitest_benchmark.rb b/tool/test/minitest/test_minitest_benchmark.rb
similarity index 100%
rename from test/minitest/test_minitest_benchmark.rb
rename to tool/test/minitest/test_minitest_benchmark.rb
diff --git a/test/minitest/test_minitest_mock.rb b/tool/test/minitest/test_minitest_mock.rb
similarity index 100%
rename from test/minitest/test_minitest_mock.rb
rename to tool/test/minitest/test_minitest_mock.rb
diff --git a/test/minitest/test_minitest_unit.rb b/tool/test/minitest/test_minitest_unit.rb
similarity index 100%
rename from test/minitest/test_minitest_unit.rb
rename to tool/test/minitest/test_minitest_unit.rb
diff --git a/test/testunit/test4test_hideskip.rb b/tool/test/testunit/test4test_hideskip.rb
similarity index 72%
rename from test/testunit/test4test_hideskip.rb
rename to tool/test/testunit/test4test_hideskip.rb
index b870c76a84..410bffc13c 100644
--- a/test/testunit/test4test_hideskip.rb
+++ b/tool/test/testunit/test4test_hideskip.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 
 require 'test/unit'
 
diff --git a/test/testunit/test4test_redefinition.rb b/tool/test/testunit/test4test_redefinition.rb
similarity index 79%
rename from test/testunit/test4test_redefinition.rb
rename to tool/test/testunit/test4test_redefinition.rb
index 894bc3d905..ad3c5e7113 100644
--- a/test/testunit/test4test_redefinition.rb
+++ b/tool/test/testunit/test4test_redefinition.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 
 require 'test/unit'
 
diff --git a/test/testunit/test4test_sorting.rb b/tool/test/testunit/test4test_sorting.rb
similarity index 79%
rename from test/testunit/test4test_sorting.rb
rename to tool/test/testunit/test4test_sorting.rb
index 4848a78b5d..698c875b79 100644
--- a/test/testunit/test4test_sorting.rb
+++ b/tool/test/testunit/test4test_sorting.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 
 require 'test/unit'
 
diff --git a/test/testunit/test_assertion.rb b/tool/test/testunit/test_assertion.rb
similarity index 100%
rename from test/testunit/test_assertion.rb
rename to tool/test/testunit/test_assertion.rb
diff --git a/test/testunit/test_hideskip.rb b/tool/test/testunit/test_hideskip.rb
similarity index 100%
rename from test/testunit/test_hideskip.rb
rename to tool/test/testunit/test_hideskip.rb
diff --git a/test/testunit/test_parallel.rb b/tool/test/testunit/test_parallel.rb
similarity index 98%
rename from test/testunit/test_parallel.rb
rename to tool/test/testunit/test_parallel.rb
index 6bbe71a749..2cb85ad3e0 100644
--- a/test/testunit/test_parallel.rb
+++ b/tool/test/testunit/test_parallel.rb
@@ -3,7 +3,7 @@ require 'test/unit'
 require 'timeout'
 
 module TestParallel
-  PARALLEL_RB = "#{File.dirname(__FILE__)}/../lib/test/unit/parallel.rb"
+  PARALLEL_RB = "#{File.dirname(__FILE__)}/../../lib/test/unit/parallel.rb"
   TESTS = "#{File.dirname(__FILE__)}/tests_for_parallel"
   # use large timeout for --jit-wait
   TIMEOUT = EnvUtil.apply_timeout_scale(RubyVM::MJIT.enabled? ? 100 : 30)
diff --git a/test/testunit/test_redefinition.rb b/tool/test/testunit/test_redefinition.rb
similarity index 100%
rename from test/testunit/test_redefinition.rb
rename to tool/test/testunit/test_redefinition.rb
diff --git a/test/testunit/test_sorting.rb b/tool/test/testunit/test_sorting.rb
similarity index 100%
rename from test/testunit/test_sorting.rb
rename to tool/test/testunit/test_sorting.rb
diff --git a/test/testunit/tests_for_parallel/ptest_first.rb b/tool/test/testunit/tests_for_parallel/ptest_first.rb
similarity index 100%
rename from test/testunit/tests_for_parallel/ptest_first.rb
rename to tool/test/testunit/tests_for_parallel/ptest_first.rb
diff --git a/test/testunit/tests_for_parallel/ptest_forth.rb b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
similarity index 100%
rename from test/testunit/tests_for_parallel/ptest_forth.rb
rename to tool/test/testunit/tests_for_parallel/ptest_forth.rb
diff --git a/test/testunit/tests_for_parallel/ptest_second.rb b/tool/test/testunit/tests_for_parallel/ptest_second.rb
similarity index 100%
rename from test/testunit/tests_for_parallel/ptest_second.rb
rename to tool/test/testunit/tests_for_parallel/ptest_second.rb
diff --git a/test/testunit/tests_for_parallel/ptest_third.rb b/tool/test/testunit/tests_for_parallel/ptest_third.rb
similarity index 100%
rename from test/testunit/tests_for_parallel/ptest_third.rb
rename to tool/test/testunit/tests_for_parallel/ptest_third.rb
diff --git a/test/testunit/tests_for_parallel/runner.rb b/tool/test/testunit/tests_for_parallel/runner.rb
similarity index 80%
rename from test/testunit/tests_for_parallel/runner.rb
rename to tool/test/testunit/tests_for_parallel/runner.rb
index bece739917..02699e271e 100644
--- a/test/testunit/tests_for_parallel/runner.rb
+++ b/tool/test/testunit/tests_for_parallel/runner.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'rbconfig'
 
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../lib"
 
 require 'test/unit'