diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-07-01 21:05:55 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-07-02 07:59:54 +0900 |
commit | c68781e9181cb43af1bac29b3c974887205c3bf3 (patch) | |
tree | 34019fe4147362f117fdc0b23d2b3533a956ccb5 | |
parent | c3c0e3f5c9444c197779cb242de46dfffda79dec (diff) | |
download | ruby-c68781e9181cb43af1bac29b3c974887205c3bf3.tar.gz |
Split test files for test-framework that are test-unit and minitest to tool direcotry.
-rwxr-xr-x | common.mk | 3 | ||||
-rw-r--r-- | tool/test/minitest/metametameta.rb (renamed from test/minitest/metametameta.rb) | 0 | ||||
-rw-r--r-- | tool/test/minitest/test_minitest_benchmark.rb (renamed from test/minitest/test_minitest_benchmark.rb) | 0 | ||||
-rw-r--r-- | tool/test/minitest/test_minitest_mock.rb (renamed from test/minitest/test_minitest_mock.rb) | 0 | ||||
-rw-r--r-- | tool/test/minitest/test_minitest_unit.rb (renamed from test/minitest/test_minitest_unit.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/test4test_hideskip.rb (renamed from test/testunit/test4test_hideskip.rb) | 2 | ||||
-rw-r--r-- | tool/test/testunit/test4test_redefinition.rb (renamed from test/testunit/test4test_redefinition.rb) | 2 | ||||
-rw-r--r-- | tool/test/testunit/test4test_sorting.rb (renamed from test/testunit/test4test_sorting.rb) | 2 | ||||
-rw-r--r-- | tool/test/testunit/test_assertion.rb (renamed from test/testunit/test_assertion.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/test_hideskip.rb (renamed from test/testunit/test_hideskip.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/test_parallel.rb (renamed from test/testunit/test_parallel.rb) | 2 | ||||
-rw-r--r-- | tool/test/testunit/test_redefinition.rb (renamed from test/testunit/test_redefinition.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/test_sorting.rb (renamed from test/testunit/test_sorting.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/tests_for_parallel/ptest_first.rb (renamed from test/testunit/tests_for_parallel/ptest_first.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/tests_for_parallel/ptest_forth.rb (renamed from test/testunit/tests_for_parallel/ptest_forth.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/tests_for_parallel/ptest_second.rb (renamed from test/testunit/tests_for_parallel/ptest_second.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/tests_for_parallel/ptest_third.rb (renamed from test/testunit/tests_for_parallel/ptest_third.rb) | 0 | ||||
-rw-r--r-- | tool/test/testunit/tests_for_parallel/runner.rb (renamed from test/testunit/tests_for_parallel/runner.rb) | 2 |
18 files changed, 7 insertions, 6 deletions
@@ -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 index a12717c8b1..a12717c8b1 100644 --- a/test/minitest/metametameta.rb +++ b/tool/test/minitest/metametameta.rb diff --git a/test/minitest/test_minitest_benchmark.rb b/tool/test/minitest/test_minitest_benchmark.rb index a783e684c2..a783e684c2 100644 --- a/test/minitest/test_minitest_benchmark.rb +++ b/tool/test/minitest/test_minitest_benchmark.rb diff --git a/test/minitest/test_minitest_mock.rb b/tool/test/minitest/test_minitest_mock.rb index 6dcf39b75e..6dcf39b75e 100644 --- a/test/minitest/test_minitest_mock.rb +++ b/tool/test/minitest/test_minitest_mock.rb diff --git a/test/minitest/test_minitest_unit.rb b/tool/test/minitest/test_minitest_unit.rb index c6c8830f20..c6c8830f20 100644 --- a/test/minitest/test_minitest_unit.rb +++ b/tool/test/minitest/test_minitest_unit.rb diff --git a/test/testunit/test4test_hideskip.rb b/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 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 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 index 0c7c4882b8..0c7c4882b8 100644 --- a/test/testunit/test_assertion.rb +++ b/tool/test/testunit/test_assertion.rb diff --git a/test/testunit/test_hideskip.rb b/tool/test/testunit/test_hideskip.rb index 0188316a2c..0188316a2c 100644 --- a/test/testunit/test_hideskip.rb +++ b/tool/test/testunit/test_hideskip.rb diff --git a/test/testunit/test_parallel.rb b/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 index 9129e55489..9129e55489 100644 --- a/test/testunit/test_redefinition.rb +++ b/tool/test/testunit/test_redefinition.rb diff --git a/test/testunit/test_sorting.rb b/tool/test/testunit/test_sorting.rb index f9de3ec154..f9de3ec154 100644 --- a/test/testunit/test_sorting.rb +++ b/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 index f8687335b5..f8687335b5 100644 --- a/test/testunit/tests_for_parallel/ptest_first.rb +++ b/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 index 8831676e19..8831676e19 100644 --- a/test/testunit/tests_for_parallel/ptest_forth.rb +++ b/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 index a793c17eb3..a793c17eb3 100644 --- a/test/testunit/tests_for_parallel/ptest_second.rb +++ b/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 index 3f448ecfc1..3f448ecfc1 100644 --- a/test/testunit/tests_for_parallel/ptest_third.rb +++ b/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 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' |