mirror of
https://github.com/python/cpython
synced 2024-10-14 16:37:41 +00:00
Fix out-of-tree build support for multissltest (GH-29694)
This commit is contained in:
parent
718cee08cc
commit
512dbf6f56
|
@ -1709,10 +1709,10 @@ quicktest: @DEF_MAKE_RULE@ platform
|
||||||
# SSL tests
|
# SSL tests
|
||||||
.PHONY: multisslcompile multissltest
|
.PHONY: multisslcompile multissltest
|
||||||
multisslcompile: build_all
|
multisslcompile: build_all
|
||||||
$(RUNSHARED) ./$(BUILDPYTHON) Tools/ssl/multissltests.py --steps=modules
|
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py --steps=modules
|
||||||
|
|
||||||
multissltest: build_all
|
multissltest: build_all
|
||||||
$(RUNSHARED) ./$(BUILDPYTHON) Tools/ssl/multissltests.py
|
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py
|
||||||
|
|
||||||
install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@
|
install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@
|
||||||
if test "x$(ENSUREPIP)" != "xno" ; then \
|
if test "x$(ENSUREPIP)" != "xno" ; then \
|
||||||
|
|
|
@ -153,8 +153,10 @@ class AbstractBuilder(object):
|
||||||
install_target = 'install'
|
install_target = 'install'
|
||||||
jobs = os.cpu_count()
|
jobs = os.cpu_count()
|
||||||
|
|
||||||
module_files = ("Modules/_ssl.c",
|
module_files = (
|
||||||
"Modules/_hashopenssl.c")
|
os.path.join(PYTHONROOT, "Modules/_ssl.c"),
|
||||||
|
os.path.join(PYTHONROOT, "Modules/_hashopenssl.c"),
|
||||||
|
)
|
||||||
module_libs = ("_ssl", "_hashlib")
|
module_libs = ("_ssl", "_hashlib")
|
||||||
|
|
||||||
def __init__(self, version, args):
|
def __init__(self, version, args):
|
||||||
|
@ -357,7 +359,7 @@ def recompile_pymods(self):
|
||||||
env["LD_RUN_PATH"] = self.lib_dir
|
env["LD_RUN_PATH"] = self.lib_dir
|
||||||
|
|
||||||
log.info("Rebuilding Python modules")
|
log.info("Rebuilding Python modules")
|
||||||
cmd = [sys.executable, "setup.py", "build"]
|
cmd = [sys.executable, os.path.join(PYTHONROOT, "setup.py"), "build"]
|
||||||
self._subprocess_call(cmd, env=env)
|
self._subprocess_call(cmd, env=env)
|
||||||
self.check_imports()
|
self.check_imports()
|
||||||
|
|
||||||
|
@ -372,7 +374,11 @@ def check_pyssl(self):
|
||||||
|
|
||||||
def run_python_tests(self, tests, network=True):
|
def run_python_tests(self, tests, network=True):
|
||||||
if not tests:
|
if not tests:
|
||||||
cmd = [sys.executable, 'Lib/test/ssltests.py', '-j0']
|
cmd = [
|
||||||
|
sys.executable,
|
||||||
|
os.path.join(PYTHONROOT, 'Lib/test/ssltests.py'),
|
||||||
|
'-j0'
|
||||||
|
]
|
||||||
elif sys.version_info < (3, 3):
|
elif sys.version_info < (3, 3):
|
||||||
cmd = [sys.executable, '-m', 'test.regrtest']
|
cmd = [sys.executable, '-m', 'test.regrtest']
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue