Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes:
> 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@xxxxxxxxx>
> ---
> t/test-lib.sh | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
Nice. I do recall seeing the duplication when these finalize-junit
calls were introduced and thought about marking it as a leftover
clean-up candidate. Nice to see it done here.
Thanks.
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 8361b5c1c57..c610f09ddb1 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -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_ () {
