mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT

Browse Source 
Change various "exit 1" checks that happened after our "die" handler
had been set up to use BAIL_OUT instead. See 234383cd40 (test-lib.sh:
use "Bail out!" syntax on bad SANITIZE=leak use, 2021-10-14) for the
benefits of the BAIL_OUT function.

The previous use of "error" here was not a logic error, but the "exit"
without "GIT_EXIT_OK" would emit the "FATAL: Unexpected exit with code
$code" message on top of the error we wanted to emit.

Since we'd also like to stop "prove" in its tracks here, the right
thing to do is to emit a "Bail out!" message.

Let's also move the "GIT_EXIT_OK=t" assignments to just above the
"exit [01]" in "test_done". It's not OK if we exit in
e.g. finalize_test_output.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-07-28 01:13:31 +02:00 committed by Junio C Hamano
parent e0258f15cb
commit 25c2351d85
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/test-lib.sh
View File

@ -1173,8 +1173,6 @@ test_done () {
# 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"
@ -1246,6 +1244,7 @@ test_done () {
fi fi
test_at_end_hook_ test_at_end_hook_
GIT_EXIT_OK=t
exit 0 ;; exit 0 ;;
*) *)
@ -1255,6 +1254,7 @@ test_done () {
say "1..$test_count" say "1..$test_count"
fi fi
GIT_EXIT_OK=t
exit 1 ;; exit 1 ;;
esac esac
@ -1387,14 +1387,12 @@ fi
GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib
export GITPERLLIB export GITPERLLIB
test -d "$GIT_BUILD_DIR"/templates/blt || { test -d "$GIT_BUILD_DIR"/templates/blt || {
error "You haven't built things yet, have you?" BAIL_OUT "You haven't built things yet, have you?"
} }
if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X
then then
echo >&2 'You need to build test-tool:' BAIL_OUT 'You need to build test-tool; Run "make t/helper/test-tool" in the source (toplevel) directory'
echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'
exit 1
fi fi
# Are we running this test at all? # Are we running this test at all?
@ -1448,9 +1446,7 @@ remove_trash_directory () {
# Test repository # Test repository
remove_trash_directory "$TRASH_DIRECTORY" || { remove_trash_directory "$TRASH_DIRECTORY" || {
GIT_EXIT_OK=t BAIL_OUT 'cannot prepare test area'
echo >&5 "FATAL: Cannot prepare test area"
exit 1
} }
remove_trash=t remove_trash=t
@ -1466,7 +1462,7 @@ fi
# Use -P to resolve symlinks in our working directory so that the cwd # Use -P to resolve symlinks in our working directory so that the cwd
# in subprocesses like git equals our $PWD (for pathname comparisons). # in subprocesses like git equals our $PWD (for pathname comparisons).
cd -P "$TRASH_DIRECTORY" || exit 1 cd -P "$TRASH_DIRECTORY" || BAIL_OUT "cannot cd -P to \"$TRASH_DIRECTORY\""
start_test_output "$0" start_test_output "$0"