Re: [PATCH 09/13] test: emacs: simplify missing dependencies check

[Tomi Ollila <tomi.ollila@iki.fi>]

On Sat, May 01 2021, Felipe Contreras wrote:

> No functional changes.

LGTM.

Tomi


>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>  test/test-lib-emacs.sh | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/test/test-lib-emacs.sh b/test/test-lib-emacs.sh
> index ecad501a..83f5b10b 100644
> --- a/test/test-lib-emacs.sh
> +++ b/test/test-lib-emacs.sh
> @@ -15,9 +15,11 @@
>  # along with this program.  If not, see https://www.gnu.org/licenses/ .
>  
>  test_require_emacs () {
> -    test_require_external_prereq emacs
> -    test_require_external_prereq ${TEST_EMACSCLIENT}
> -    test_require_external_prereq dtach
> +    local ret=0
> +    test_require_external_prereq emacs || ret=1
> +    test_require_external_prereq ${TEST_EMACSCLIENT} || ret=1
> +    test_require_external_prereq dtach || ret=1
> +    return $ret
>  }
>  
>  # Deliver a message with emacs and add it to the database
> @@ -167,11 +169,7 @@ EOF
>  
>  test_emacs () {
>  	# test dependencies beforehand to avoid the waiting loop below
> -	missing_dependencies=
> -	test_require_external_prereq dtach || missing_dependencies=1
> -	test_require_external_prereq emacs || missing_dependencies=1
> -	test_require_external_prereq ${TEST_EMACSCLIENT} || missing_dependencies=1
> -	test -z "$missing_dependencies" || return
> +	test_require_emacs || return
>  
>  	if [ -z "$EMACS_SERVER" ]; then
>  		emacs_tests="$NOTMUCH_SRCDIR/test/${this_test_bare}.el"
> -- 
> 2.31.0
> _______________________________________________
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-leave@notmuchmail.org