[PATCH v6 00/12] t: detect errors outside of test cases
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Apr 21, 2026, 07:34 UTC
- Message-ID
- <20260421-b4-pks-tests-with-set-e-v6-0-26330e3061ab@pks.im>
- In-Reply-To
- <20260413-b4-pks-tests-with-set-e-v1-0-5b83763a0e84@pks.im>
Hi,
this is a follow-up to the recent discussion we had around `set -e` to make our tests more robust and basically supersedes Junio's [1].
I've tested the patches with both Bash and Dash, and all tests are passing on my machine with both of them. CI seems to be happy, as well. But I would expect that this change probably has some fallout, even though I hope that it's generally going to be small and contained.
This series is based on 8c9303b1ff (Merge branch 'jc/no-writev-does-not-work', 2026-04-10).
I've created an MR with GitLab [2] and a PR with GitHub [3] to verify that these changes work on both platforms.
Changes in v6: - Drop the change in t1410, which is only required for broken shells. - Link to v5: https://patch.msgid.link/20260420-b4-pks-tests-with-set-e-v5-0-7d3d68292f6b@pks.im
Changes in v5:
- Allow opting in via `GIT_TEST_USE_SET_E=yes` and enable this option
for Linux CI jobs.
- Another fix for a potentially-failing command.
- Link to v4: https://patch.msgid.link/20260417-b4-pks-tests-with-set-e-v4-0-44d43efdafb1@pks.imChanges in v4: - Simplify how we read a multi-line variable value. - Link to v3: https://patch.msgid.link/20260416-b4-pks-tests-with-set-e-v3-0-7a90e5dccadd@pks.im
Changes in v3:
- Adapt `linux-TEST-vars` job to use Bash instead of Dash. Ubuntu
packet mirrors seem to be having problems, so I wasn't able to get
past installing dependencies in any jobs. All to say that I couldn't
verify that this works as expected :/
- Link to v2: https://patch.msgid.link/20260415-b4-pks-tests-with-set-e-v2-0-4e4904a96f15@pks.imChanges in v2:
- Use `ret=0; $command || ret=$?` pattern.
- Restore `echo 0` in SIGPIPE tests.
- Fix "lib-git-svn.sh" to gracefully handle the case where SVN Perl
modules aren't installed.
- Use `|| :` consistently instead of `|| true`.
- Fix up a couple of tests that fail on FreeBSD 15. The test suite is
now passing on this system, too.
- Only enable `set -e` on Bash 5 and newer.
- Link to v1: https://patch.msgid.link/20260413-b4-pks-tests-with-set-e-v1-0-5b83763a0e84@pks.imThanks!
Patrick
[1]: <20260325062114.2067946-1-gitster@pobox.com> [2]: https://gitlab.com/gitlab-org/git/-/merge_requests/541 [3]: https://github.com/git/git/pull/2270
---
Patrick Steinhardt (12):
t: prepare `test_match_signal ()` calls for `set -e`
t: prepare `test_must_fail ()` for `set -e`
t: prepare `stop_git_daemon ()` for `set -e`
t: prepare `git config --unset` calls for `set -e`
t: prepare conditional test execution for `set -e`
t: prepare execution of potentially failing commands for `set -e`
t: prepare `test_when_finished ()`/`test_atexit()` for `set -e`
t0008: silence error in subshell when using `grep -v`
t1301: don't fail in case setfacl(1) doesn't exist or fails
t6002: fix use of `expr` with `set -e`
t9902: fix use of `read` with `set -e`
t: detect errors outside of test casesci/run-build-and-tests.sh | 6 ++++++ t/lib-git-daemon.sh | 8 +++++--- t/lib-git-svn.sh | 7 +++---- t/lib-httpd.sh | 3 +-- t/t0005-signals.sh | 4 ++-- t/t0008-ignores.sh | 4 ++-- t/t1301-shared-repo.sh | 2 +- t/t3600-rm.sh | 2 +- t/t3901-i18n-patch.sh | 3 ++- t/t4032-diff-inter-hunk-context.sh | 14 ++++++++------ t/t5000-tar-tree.sh | 4 ++-- t/t6002-rev-list-bisect.sh | 17 ++++++++++------- t/t7422-submodule-output.sh | 2 +- t/t7450-bad-git-dotfiles.sh | 24 +++++++++++++----------- t/t7508-status.sh | 4 ++-- t/t9138-git-svn-authors-prog.sh | 4 ++-- t/t9200-git-cvsexportcommit.sh | 3 +-- t/t9400-git-cvsserver-server.sh | 5 +++-- t/t9401-git-cvsserver-crlf.sh | 4 ++-- t/t9402-git-cvsserver-refs.sh | 4 ++-- t/t9902-completion.sh | 6 ++---- t/test-lib-functions.sh | 12 ++++++------ t/test-lib.sh | 35 +++++++++++++++++++++++++++++++---- 23 files changed, 108 insertions(+), 69 deletions(-)
Range-diff versus v5:
1: a7fd95c0f8 = 1: e619a6f565 t: prepare `test_match_signal ()` calls for `set -e`
2: 1edfada458 = 2: 9002a8e77e t: prepare `test_must_fail ()` for `set -e`
3: 9c703ea3ec = 3: b375926fc4 t: prepare `stop_git_daemon ()` for `set -e`
4: 855707f648 = 4: 0d46e4212e t: prepare `git config --unset` calls for `set -e`
5: e24c272d06 = 5: 5bdb1ad025 t: prepare conditional test execution for `set -e`
6: dd89a14595 ! 6: 7654824960 t: prepare execution of potentially failing commands for `set -e`
@@ t/lib-httpd.sh: start_httpd() {
cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
- ## t/t1410-reflog.sh ##
-@@ t/t1410-reflog.sh: check_have () {
- }
-
- check_fsck () {
-- git fsck --full >fsck.output
-+ git fsck --full >fsck.output || true
- case "$1" in
- '')
- test_must_be_empty fsck.output ;;
-
## t/t3901-i18n-patch.sh ##
@@ t/t3901-i18n-patch.sh: check_encoding () {
8859)
7: dfcbb1ed20 = 7: 8f5ee3234a t: prepare `test_when_finished ()`/`test_atexit()` for `set -e`
8: cef0ff3bf9 = 8: 46b4ddf1fc t0008: silence error in subshell when using `grep -v`
9: f0e43f0f54 = 9: 6e21a1af73 t1301: don't fail in case setfacl(1) doesn't exist or fails
10: b61761cfdb = 10: c1c907187f t6002: fix use of `expr` with `set -e`
11: 591e53ab47 = 11: b6df934d90 t9902: fix use of `read` with `set -e`
12: dd7a68c141 = 12: 60681e8ebe t: detect errors outside of test cases--- base-commit: 8c9303b1ffae5b745d1b0a1f98330cf7944d8db0 change-id: 20260410-b4-pks-tests-with-set-e-3ae479b24b51