undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib.sh: de-duplicate error() teardown code

Browse Source 
De-duplicate the "finalize_junit_xml; GIT_EXIT_OK=t; exit 1" code
shared between the "error()" and "--immediate on failure" code paths,
in preparation for adding a third user in a subsequent commit.

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 2021-10-14 02:47:28 +02:00 committed by Junio C Hamano
parent 2bd2f258f4
commit 8583bf7559
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/test-lib.sh
View File

@ -589,13 +589,17 @@ USER_TERM="$TERM"
TERM=dumb
export TERM USER_TERM
error () {
say_color error "error: $*"
_error_exit () {
finalize_junit_xml
GIT_EXIT_OK=t
exit 1
}
error () {
say_color error "error: $*"
_error_exit
}
BUG () {
error >&7 "bug in the test script: $*"
}
@ -720,7 +724,7 @@ test_failure_ () {
say_color error "not ok $test_count - $1"
shift
printf '%s\n' "$*" | sed -e 's/^/# /'
test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
test "$immediate" = "" || _error_exit
}
test_known_broken_ok_ () {