[PATCH 3 of 3] run-tests: drop support for --with-python3 and $PYTHON3
Yuya Nishihara
yuya at tcha.org
Sun Sep 2 03:43:57 EDT 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1535873531 -32400
# Sun Sep 02 16:32:11 2018 +0900
# Node ID 48fd418c6a06aee9baf64a2c81a1205119a0041f
# Parent db45c60203e769d9dfaed7fa7ac5715f8b838539
run-tests: drop support for --with-python3 and $PYTHON3
This backs out cdbc25306696. We can run many tests on python3 without
this hack.
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -395,11 +395,6 @@ def getparser():
metavar="HG",
help="test using specified hg script rather than a "
"temporary installation")
- # This option should be deleted once test-check-py3-compat.t and other
- # Python 3 tests run with Python 3.
- hgconf.add_argument("--with-python3", metavar="PYTHON3",
- help="Python 3 interpreter (if running under Python 2)"
- " (TEMPORARY)")
reporting = parser.add_argument_group('Results Reporting')
reporting.add_argument("-C", "--annotate", action="store_true",
@@ -533,27 +528,6 @@ def parseargs(args, parser):
if PYTHON3:
parser.error(
'--py3k-warnings can only be used on Python 2.7')
- if options.with_python3:
- if PYTHON3:
- parser.error('--with-python3 cannot be used when executing with '
- 'Python 3')
-
- options.with_python3 = canonpath(options.with_python3)
- # Verify Python3 executable is acceptable.
- proc = subprocess.Popen([options.with_python3, b'--version'],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
- out, _err = proc.communicate()
- ret = proc.wait()
- if ret != 0:
- parser.error('could not determine version of python 3')
- if not out.startswith('Python '):
- parser.error('unexpected output from python3 --version: %s' %
- out)
- vers = version.LooseVersion(out[len('Python '):])
- if vers < version.LooseVersion('3.5.0'):
- parser.error('--with-python3 version must be 3.5.0 or greater; '
- 'got %s' % out)
if options.blacklist:
options.blacklist = parselistfiles(options.blacklist, 'blacklist')
@@ -2611,9 +2585,6 @@ class TestRunner(object):
osenvironb[b"BINDIR"] = self._bindir
osenvironb[b"PYTHON"] = PYTHON
- if self.options.with_python3:
- osenvironb[b'PYTHON3'] = self.options.with_python3
-
fileb = _bytespath(__file__)
runtestdir = os.path.abspath(os.path.dirname(fileb))
osenvironb[b'RUNTESTDIR'] = runtestdir
More information about the Mercurial-devel
mailing list