summaryrefslogtreecommitdiffstats
path: root/ci/run-build-and-tests.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2024-05-06 21:57:36 +0200
committerJunio C Hamano <gitster@pobox.com>2024-05-06 23:06:35 +0200
commitcc75e4a08f7a8e2315cc56c8194c72ea5da785b2 (patch)
tree3f23d37d6687d8408e7a53255e5a794000eef8f6 /ci/run-build-and-tests.sh
parentunit tests: add rule for running with test-tool (diff)
downloadgit-cc75e4a08f7a8e2315cc56c8194c72ea5da785b2.tar.xz
git-cc75e4a08f7a8e2315cc56c8194c72ea5da785b2.zip
t/Makefile: run unit tests alongside shell tests
Add a wrapper script to allow `prove` to run both shell tests and unit tests from a single invocation. This avoids issues around running prove twice in CI, as discussed in [1]. Additionally, this moves the unit tests into the main dev workflow, so that errors can be spotted more quickly. Accordingly, we remove the separate unit tests step for Linux CI. (We leave the Windows CI unit-test step as-is, because the sharding scheme there involves selecting specific test files rather than running `make test`.) [1] https://lore.kernel.org/git/pull.1613.git.1699894837844.gitgitgadget@gmail.com/ Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/run-build-and-tests.sh')
-rwxr-xr-xci/run-build-and-tests.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 7a1466b868..2528f25e31 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -50,8 +50,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