Split test files for test-framework that are test-unit and minitest to tool direcotry.

2019-07-01 21:05:55 +09:00 · 2019-07-01 21:05:55 +09:00 · c68781e918
--- 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
--- a/tool/test/minitest/metametameta.rb
+++ b/tool/test/minitest/metametameta.rb
--- a/tool/test/minitest/test_minitest_benchmark.rb
+++ b/tool/test/minitest/test_minitest_benchmark.rb
--- a/tool/test/minitest/test_minitest_mock.rb
+++ b/tool/test/minitest/test_minitest_mock.rb
--- a/tool/test/minitest/test_minitest_unit.rb
+++ b/tool/test/minitest/test_minitest_unit.rb
--- a/tool/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'

--- a/tool/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'

--- a/tool/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'

--- a/tool/test/testunit/test_assertion.rb
+++ b/tool/test/testunit/test_assertion.rb
--- a/tool/test/testunit/test_hideskip.rb
+++ b/tool/test/testunit/test_hideskip.rb
--- a/tool/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)
--- a/tool/test/testunit/test_redefinition.rb
+++ b/tool/test/testunit/test_redefinition.rb
--- a/tool/test/testunit/test_sorting.rb
+++ b/tool/test/testunit/test_sorting.rb
--- a/tool/test/testunit/tests_for_parallel/ptest_first.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_first.rb
--- a/tool/test/testunit/tests_for_parallel/ptest_forth.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
--- a/tool/test/testunit/tests_for_parallel/ptest_second.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_second.rb
--- a/tool/test/testunit/tests_for_parallel/ptest_third.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_third.rb
--- a/tool/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'