languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-07-20 17:55:24 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix out-of-tree build support for multissltest (GH-29694)

Browse source
This commit is contained in:
Christian Heimes 2021-11-22 11:50:53 +02:00 committed by GitHub
parent 718cee08cc
commit 512dbf6f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.pre.in
View file

@ -1709,10 +1709,10 @@ quicktest: @DEF_MAKE_RULE@ platform
# SSL tests
.PHONY: multisslcompile multissltest
multisslcompile: build_all
$(RUNSHARED) ./$(BUILDPYTHON) Tools/ssl/multissltests.py --steps=modules
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py --steps=modules
multissltest: build_all
$(RUNSHARED) ./$(BUILDPYTHON) Tools/ssl/multissltests.py
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py
install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@
if test "x$(ENSUREPIP)" != "xno" ; then \

14
Tools/ssl/multissltests.py
View file

@ -153,8 +153,10 @@ class AbstractBuilder(object):
install_target = 'install'
jobs = os.cpu_count()
module_files = ("Modules/_ssl.c",
"Modules/_hashopenssl.c")
module_files = (
os.path.join(PYTHONROOT, "Modules/_ssl.c"),
os.path.join(PYTHONROOT, "Modules/_hashopenssl.c"),
)
module_libs = ("_ssl", "_hashlib")
def __init__(self, version, args):
@ -357,7 +359,7 @@ def recompile_pymods(self):
env["LD_RUN_PATH"] = self.lib_dir
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.check_imports()
@ -372,7 +374,11 @@ def check_pyssl(self):
def run_python_tests(self, tests, network=True):
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):
cmd = [sys.executable, '-m', 'test.regrtest']
else: