Skip to content

Cleanups in psa_compliance.py #221

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Cleanups in psa_compliance.py #221

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3efe3b7
Improve docstring following the split
gilles-peskine-arm Sep 30, 2025
47cb485
Make patch_directory robust wrt glob characters
gilles-peskine-arm Sep 30, 2025
4e75c46
Use standard way of specifying a default value for --build-dir
gilles-peskine-arm Sep 30, 2025
12564d9
Improve --help
gilles-peskine-arm Sep 30, 2025
aa9f114
Make psa-arch-tests repo and commit configurable on the command line
gilles-peskine-arm Sep 30, 2025
5a6c2a4
Make it explicit whether to reset psa-arch-tests
gilles-peskine-arm Sep 30, 2025
c8f1fc9
Save time by only building the library, not our tests
gilles-peskine-arm Sep 30, 2025
dd50542
Fix fatal exception on expected failures
gilles-peskine-arm Oct 3, 2025
eabf862
Mix psa-arch-tests stderr with stdout
gilles-peskine-arm Oct 3, 2025
feccfdc
Sort collections explicitly when printing
gilles-peskine-arm Oct 6, 2025
4c1dc1c
Update docstring
gilles-peskine-arm Oct 6, 2025
c40dc75
Make the psa-arch-tests build directory configurable
gilles-peskine-arm Oct 6, 2025
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
21 changes: 13 additions & 8 deletions scripts/mbedtls_framework/psa_compliance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ def test_compliance(library_build_dir: str,
"""Check out and run compliance tests.

library_build_dir: path where our library will be built.
psa_arch_tests_ref: tag or sha to use for the arch-tests.
patch: patch to apply to the arch-tests with ``patch -p1``.
psa_arch_tests_ref: tag or sha to use for the arch-tests
(empty=default/leave alone).
patch: patch to apply to the arch-tests with ``patch -p1``
(not if psa_arch_tests_ref is empty).
expected_failures: default list of expected failures.
"""
root_dir = os.getcwd()
Expand All @@ -62,14 +64,16 @@ def test_compliance(library_build_dir: str,
# Reuse existing local clone
subprocess.check_call(['git', 'init'])
subprocess.check_call(['git', 'fetch', psa_arch_tests_repo, psa_arch_tests_ref])
subprocess.check_call(['git', 'checkout', '--force', 'FETCH_HEAD'])

if patch_files:
# Reuse existing working copy if psa_arch_tests_ref is empty.
# Otherwise check out and patch the specified ref.
if psa_arch_tests_ref:
subprocess.check_call(['git', 'checkout', '--force', 'FETCH_HEAD'])
subprocess.check_call(['git', 'reset', '--hard'])
for patch_file in patch_files:
with open(os.path.join(root_dir, patch_file), 'rb') as patch:
subprocess.check_call(['patch', '-p1'],
stdin=patch)
for patch_file in patch_files:
with open(os.path.join(root_dir, patch_file), 'rb') as patch:
subprocess.check_call(['patch', '-p1'],
stdin=patch)

build_dir = 'api-tests/build'
try:
Expand Down Expand Up @@ -174,6 +178,7 @@ def main(psa_arch_tests_ref: str,
parser.add_argument('--tests-ref', metavar='REF',
default=psa_arch_tests_ref,
help=('Commit (tag/branch/sha) to use for psa-arch-tests '
'(empty to use whatever is there and skip patching) '
'(default: %(default)s)'))
parser.add_argument('--tests-repo', metavar='URL',
default=PSA_ARCH_TESTS_REPO,
Expand Down