Re: [PATCH v4 3/3] test-lib: make BAIL_OUT() work in tests and prereq
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 1, 2021, 23:13 UTC
- Message-ID
- <xmqqv907yl40.fsf@gitster.g>
- In-Reply-To
- <20211201085315.576865-4-fs@gigacodes.de>
Fabian Stelzer <fs@gigacodes.de> writes:
Show 22 quoted lines
> 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@gigacodes.de> > --- > t/test-lib.sh | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 9090ce1225..14a7aeae0f 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -589,6 +589,15 @@ USER_TERM="$TERM" > TERM=dumb > export TERM USER_TERM > > +# What is written by tests to stdout and stderr is sent so different places
"sent so" -> "sent to". I'll tweak locally, so no need to resend.
Show 17 quoted lines
> +# depending on the test mode (e.g. /dev/null in non-verbose mode, piped to tee
> +# with --tee option, etc.). We save the original stdin to FD #6 and stdout and
> +# stderr to #5 and #7, so that the test framework can use them (e.g. for
> +# printing errors within the test framework) independently of the test mode.
> +exec 5>&1
> +exec 6<&0
> +exec 7>&2
> +
> _error_exit () {
> finalize_junit_xml
> GIT_EXIT_OK=t
> @@ -612,7 +621,7 @@ BAIL_OUT () {
> local bail_out="Bail out! "
> local message="$1"
>
> - say_color error $bail_out "$message"
> + say_color error $bail_out "$message" >&5This is merely a style thing, but as commands get longer, it becomes easier to spot redirection if it is written immediately after the verb, i.e.
say_color >&5 error $bail_out "$message"
Show 13 quoted lines
> _error_exit > } > > @@ -637,9 +646,6 @@ then > exit 0 > fi > > -exec 5>&1 > -exec 6<&0 > -exec 7>&2 > if test "$verbose_log" = "t" > then > exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
Looks good. Thanks.