diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -631,7 +631,7 @@ @check("py3exe", "a Python 3.x interpreter is available") def has_python3exe(): - return 'PYTHON3' in os.environ + return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)') @check("py3pygments", "Pygments available on Python 3.x") def has_py3pygments(): diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -27,7 +27,7 @@ > -X hgdemandimport/demandimportpy2.py \ > -X hgext/fsmonitor/pywatchman \ > -X mercurial/thirdparty/cbor \ - > | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py \ + > | sed 's|\\|/|g' | xargs python3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' contrib/python-zstandard/setup.py not using absolute_import contrib/python-zstandard/setup_zstd.py not using absolute_import @@ -48,6 +48,6 @@ #if py3exe py3pygments $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ - > | xargs $PYTHON3 contrib/check-py3-compat.py \ + > | xargs python3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' #endif