diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-15 09:52:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-15 09:52:52 -0700 |
| commit | b7a1d47ba5dd0df476104a63c6ddffe2d52fccf8 (patch) | |
| tree | c08317ab5a0357b8b0252ec483132740ed4402e4 /ci | |
| parent | 83f1add914c6b4682de1e944ec0d1ac043d53d78 (diff) | |
| parent | 951105664dd4de73a8c949b0fb875e895d149ece (diff) | |
| download | git-b7a1d47ba5dd0df476104a63c6ddffe2d52fccf8.tar.xz | |
Merge branch 'js/unit-test-suite-runner'
The "test-tool" has been taught to run testsuite tests in parallel,
bypassing the need to use the "prove" tool.
* js/unit-test-suite-runner:
cmake: let `test-tool` run the unit tests, too
ci: use test-tool as unit test runner on Windows
t/Makefile: run unit tests alongside shell tests
unit tests: add rule for running with test-tool
test-tool run-command testsuite: support unit tests
test-tool run-command testsuite: remove hardcoded filter
test-tool run-command testsuite: get shell from env
t0080: turn t-basic unit test into a helper
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-build-and-tests.sh | 2 | ||||
| -rwxr-xr-x | ci/run-test-slice.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index c192bd613c..98dda42045 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -53,8 +53,6 @@ if test -n "$run_tests" then group "Run tests" make test || handle_failed_tests - group "Run unit tests" \ - make DEFAULT_UNIT_TEST_TARGET=unit-tests-prove unit-tests fi check_unignored_build_artifacts diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh index ae8094382f..e167e646f7 100755 --- a/ci/run-test-slice.sh +++ b/ci/run-test-slice.sh @@ -17,7 +17,7 @@ handle_failed_tests # We only have one unit test at the moment, so run it in the first slice if [ "$1" == "0" ] ; then - group "Run unit tests" make --quiet -C t unit-tests-prove + group "Run unit tests" make --quiet -C t unit-tests-test-tool fi check_unignored_build_artifacts |