From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 27 Jul 2022 23:13:30 +0000 (+0200)
Subject: test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
X-Git-Tag: v2.38.0-rc0~83^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0258f15cbe1412659a0a68ac17b42dd470a49fb;p=thirdparty%2Fgit.git

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>
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3f11ce3511..c8c84ef9b1 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"