diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-07-27 23:13:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 23:35:39 (GMT) |
| commit | e0258f15cbe1412659a0a68ac17b42dd470a49fb (patch) | |
| tree | 1d59aa877ecff4312a17961986aaea040277d040 /t/test-lib.sh | |
| parent | 6d00680de2c8a517f2b6b5853588786ed92fae93 (diff) | |
| download | git-e0258f15cbe1412659a0a68ac17b42dd470a49fb.zip git-e0258f15cbe1412659a0a68ac17b42dd470a49fb.tar.gz git-e0258f15cbe1412659a0a68ac17b42dd470a49fb.tar.bz2 | |
test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
Change the control flow in test_done so that we'll set GIT_EXIT_OK=t
after we call test_atexit_handler(). This seems to have been a mistake
in 900721e15c4 (test-lib: introduce 'test_atexit', 2019-03-13). It
doesn't make sense to allow our "atexit" handling to call "exit"
without us emitting the errors we'll emit without GIT_EXIT_OK=t being
set.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 3f11ce3..c8c84ef 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1169,12 +1169,12 @@ test_atexit_handler () { } test_done () { - GIT_EXIT_OK=t - # Run the atexit commands _before_ the trash directory is # removed, so the commands can access pidfiles and socket files. test_atexit_handler + GIT_EXIT_OK=t + finalize_test_output if test -z "$HARNESS_ACTIVE" |