FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix out-of-tree build support for multissltest (GH-29694) by tiran · Pull Request #29694 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 1 commit into from
Nov 22, 2021
Conversation 2 Commits 1 Checks 0 Files changed
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .in  (1) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 2 additions & 2 deletions Makefile.pre.in
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
14 changes: 10 additions & 4 deletions Tools/ssl/multissltests.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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()

Expand All @@ -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:
Expand Down
Back | FazBrowse Home | New Git URL