On 2020-07-27 20:37:10+0300, Tomi Ollila <tomi.ollila@iki.fi> wrote: > 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. Yes, that's definitely better option, I also use that command in other code base, but forgot to take it here. This is the updated patch: -----------------------8<---------------------- From c6d8681d467bef9fe43c039ed1e2e467b99b6c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> Date: Mon, 27 Jul 2020 16:42:02 +0700 Subject: [PATCH v2] configure: check for pytest with python -m pytest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On different distro, pytest is suffixed with different patterns. On the other hand, `python3-pytest' could be invoked correctly, via `python3 -m pytest', the latter is used by our tests, now. Switch to `$python -m pytest` to fix address all incompatible naming. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index db3538b3..f7c1c095 100755 --- a/configure +++ b/configure @@ -814,7 +814,7 @@ 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 + if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then printf "Yes.\n" have_python3_pytest=1 else -- 2.28.0.rc2.21.g5c06d60fc5 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org