Re: [PATCH] configure: account for various name of pytest-3

Subject: Re: [PATCH] configure: account for various name of pytest-3

Date: Mon, 27 Jul 2020 20:37:10 +0300

To: Đoàn Trần Công Danh, notmuch@notmuchmail.org

Cc: Đoàn Trần Công Danh

From: Tomi Ollila


On Mon, Jul 27 2020, Đoàn Trần Công Danh wrote:

> On different distro, pytest is suffixed with different patterns.
> Try to account for them, now.
>
> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> ---
>  configure | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index db3538b3..90bc9182 100755
> --- a/configure
> +++ b/configure
> @@ -814,10 +814,15 @@ if [ $have_python3 -eq 1 ]; then
>      printf "Checking for python3 pytest (>= 3.0)... "
>      conf=$(mktemp)
>      printf "[pytest]\nminversion=3.0\n" > $conf
> -    if pytest-3 -c $conf --version >/dev/null 2>&1; then
> -        printf "Yes.\n"
> -        have_python3_pytest=1
> -    else
> +    for _pytest_cmd in pytest-3 pytest3; do

We use `${NOTMUCH_PYTHON} -m pytest` in tests to run the python
tests. IMO it would be better to change this check to do the
same with already resolved python3 command.

Tomi

> +        if command -v $_pytest_cmd >/dev/null 2>&1 &&
> +                $_pytest_cmd -c $conf --version >/dev/null 2>&1; then
> +            printf "Yes.\n"
> +            have_python3_pytest=1
> +            break
> +        fi
> +    done
> +    if [ "have_python3_pytest" = "0" ]; then
>          printf "No (will not test CFFI-based python bindings).\n"
>      fi
>      rm -f $conf
> -- 
> 2.28.0.rc2.21.g5c06d60fc5
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: