On Sat, Nov 20 2021, Fabian Stelzer wrote:
> BAIL_OUT() is meant to abort the whole test run and print a message with
> a standard prefix that can be parsed to stdout. Since for every test the
> normal fd`s are redirected in test_eval_ this output would not be seen
> when used within the context of a test or prereq like we do in
> test_have_prereq(). To make this function work in these contexts we move
> the setup of the fd aliases a few lines up before the first use of
> BAIL_OUT() and then have this function always print to the alias.
>
> Signed-off-by: Fabian Stelzer <fs@xxxxxxxxxxxx>
> ---
> t/test-lib.sh | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index f61da562f6..96a09a26a1 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -589,6 +589,11 @@ USER_TERM="$TERM"
> TERM=dumb
> export TERM USER_TERM
>
> +# Set up additional fds so we can control single test i/o
> +exec 5>&1
> +exec 6<&0
> +exec 7>&2
> +
> _error_exit () {
> finalize_junit_xml
> GIT_EXIT_OK=t
> @@ -612,7 +617,7 @@ BAIL_OUT () {
> local bail_out="Bail out! "
> local message="$1"
>
> - say_color error $bail_out "$message"
> + say_color error $bail_out "$message" >&5
> _error_exit
> }
>
> @@ -637,9 +642,6 @@ then
> exit 0
> fi
>
> -exec 5>&1
> -exec 6<&0
> -exec 7>&2
This doesn't break (I think) with your change here because you only
manipulate >&5, but I think the post-image would be lot clearer if...
> if test "$verbose_log" = "t"
> then
> exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
...this bit of code were moved up along with the "exec". They're
currently intentionally snuggled together as we conditionally set the
3rd and 4th fd depending on verbose/tee settings right after the setup
of 5/6/7, keeping them grouped in the post-image makes more sense than
splitting them up here.
