Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a104f8a
Adapt @hugovk's proof-of-concept CI definition refactor
WillChilds-Klein Jul 14, 2025
3fcbe0d
Preliminary refactor of multissltests.py, TODO migrate to classes
WillChilds-Klein Jul 14, 2025
5d8ec9a
Fix aws-lc/awslc lib name discrepancy
WillChilds-Klein Jul 14, 2025
991c6b2
Migrate AbstractBuilder to abc
WillChilds-Klein Jul 14, 2025
7b51499
Fix imports
WillChilds-Klein Jul 14, 2025
6638127
Complete ABC refactor
WillChilds-Klein Jul 16, 2025
4e0a8ca
Colorize parser
WillChilds-Klein Jul 16, 2025
1a90e0c
Adjust compatibility comment
WillChilds-Klein Jul 16, 2025
1fcb49f
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 16, 2025
dd969fb
Revert "📜🤖 Added by blurb_it."
WillChilds-Klein Jul 16, 2025
1edce1c
Merge branch 'main' into refactor-ssl-tests
WillChilds-Klein Jul 16, 2025
3343120
Include old versions when using default versions
WillChilds-Klein Jul 16, 2025
82f1154
Merge remote-tracking branch 'upstream/main' into 3.15-refactor-ssl-t…
hugovk Jan 16, 2026
0560203
Apply suggestions from code review
hugovk Jan 16, 2026
08be1f2
Bump GitHub Actions
hugovk Jan 16, 2026
b2f353c
Merge remote-tracking branch 'upstream/main' into 3.15-refactor-ssl-t…
hugovk Jan 16, 2026
31325c5
Retain multiline
hugovk Jan 16, 2026
94a826d
Use extend instead of += [...]
hugovk Jan 16, 2026
9113833
Remove 3.3 block, use long options
hugovk Jan 16, 2026
942434a
Apply suggestions from code review
hugovk Jan 17, 2026
f3f0824
Add support for OpenSSL 3.6, drop EOL 3.2
hugovk Jan 20, 2026
181e676
Merge branch 'main' into 3.15-refactor-ssl-tests
hugovk Jan 20, 2026
85baf65
Merge branch 'main' into 3.15-refactor-ssl-tests
hugovk Feb 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Migrate AbstractBuilder to abc
  • Loading branch information
WillChilds-Klein committed Jul 14, 2025
commit 991c6b28096b4bfbb6634dcd07d725c7d9141f0d
104 changes: 78 additions & 26 deletions Tools/ssl/multissltests.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"""
from __future__ import print_function

import abc
import argparse
from datetime import datetime
import logging
Expand Down Expand Up @@ -146,18 +147,34 @@
)


class AbstractBuilder(object):
library = None
url_templates = None
src_template = None
build_template = None
class AbstractBuilder(object, metaclass=abc.ABCMeta):
depend_target = None
install_target = 'install'
if hasattr(os, 'process_cpu_count'):
jobs = os.process_cpu_count()
else:
jobs = os.cpu_count()

@property
@abstractmethod
def library(self):
pass

@property
@abstractmethod
def url_templates(self):
pass

@property
@abstractmethod
def src_template(self):
pass

@property
@abstractmethod
def build_template(self):
pass

module_files = (
os.path.join(PYTHONROOT, "Modules/_ssl.c"),
os.path.join(PYTHONROOT, "Modules/_hashopenssl.c"),
Expand All @@ -167,9 +184,10 @@ class AbstractBuilder(object):
def __init__(self, version, args):
self.version = version
self.args = args
libdir = self.library.lower().replace("-", "")
# installation directory
self.install_dir = os.path.join(
os.path.join(args.base_directory, self.library.lower()), version
os.path.join(args.base_directory, libdir), version
)
# source file
self.src_dir = os.path.join(args.base_directory, 'src')
Expand Down Expand Up @@ -396,18 +414,30 @@ def run_python_tests(self, tests, network=True):


class BuildOpenSSL(AbstractBuilder):
library = "OpenSSL"
url_templates = (
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
"https://www.openssl.org/source/openssl-{v}.tar.gz",
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
)
src_template = "openssl-{}.tar.gz"
build_template = "openssl-{}"
# only install software, skip docs
install_target = 'install_sw'
depend_target = 'depend'

@property
def library(self):
return "OpenSSL"

@property
def url_templates(self):
return (
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
"https://www.openssl.org/source/openssl-{v}.tar.gz",
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz",
)

@property
def src_template(self):
return "openssl-{}.tar.gz"

@property
def build_template(self):
return "openssl-{}"

def _post_install(self):
if self.version.startswith("3."):
self._post_install_3xx()
Expand Down Expand Up @@ -443,21 +473,43 @@ def short_version(self):


class BuildLibreSSL(AbstractBuilder):
library = "LibreSSL"
url_templates = (
"https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-{v}.tar.gz",
)
src_template = "libressl-{}.tar.gz"
build_template = "libressl-{}"
@property
def library(self):
return "LibreSSL"

@property
def url_templates(self):
return (
"https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-{v}.tar.gz",
)

@property
def src_template(self):
return "libressl-{}.tar.gz"

@property
def build_template(self):
"libressl-{}"


class BuildAWSLC(AbstractBuilder):
library = "AWS-LC"
url_templates = (
"https://github.com/aws/aws-lc/archive/refs/tags/v{v}.tar.gz",
)
src_template = "aws-lc-{}.tar.gz"
build_template = "aws-lc-{}"
@property
def library(self):
return "AWS-LC"

@property
def url_templates(self):
return (
"https://github.com/aws/aws-lc/archive/refs/tags/v{v}.tar.gz",
)

@property
def src_template(self):
return "aws-lc-{}.tar.gz"

@property
def build_template(self):
return "aws-lc-{}"

def _build_src(self, config_args=()):
cwd = self.build_dir
Expand Down