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 900721e15c
(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>
maint
parent
6d00680de2
commit
e0258f15cb
|
@ -1169,12 +1169,12 @@ test_atexit_handler () {
|
||||||
}
|
}
|
||||||
|
|
||||||
test_done () {
|
test_done () {
|
||||||
GIT_EXIT_OK=t
|
|
||||||
|
|
||||||
# Run the atexit commands _before_ the trash directory is
|
# Run the atexit commands _before_ the trash directory is
|
||||||
# removed, so the commands can access pidfiles and socket files.
|
# removed, so the commands can access pidfiles and socket files.
|
||||||
test_atexit_handler
|
test_atexit_handler
|
||||||
|
|
||||||
|
GIT_EXIT_OK=t
|
||||||
|
|
||||||
finalize_test_output
|
finalize_test_output
|
||||||
|
|
||||||
if test -z "$HARNESS_ACTIVE"
|
if test -z "$HARNESS_ACTIVE"
|
||||||
|
|
Loading…
Reference in New Issue