Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions scripts/ci.requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,9 @@ pylint == 2.4.4; platform_system == 'Linux'
# https://github.com/Mbed-TLS/mbedtls-framework/issues/50
# mypy 0.942 is the version in Ubuntu 22.04.
mypy == 0.942; platform_system == 'Linux'

# More requirements for scripts in the framework that might not work in
# older versions of Python. Note that requirements that are not available
# in the oldest version of Python on our CI must be annodated with
# "python >= ...".
-r ../framework/util/requirements.txt
20 changes: 20 additions & 0 deletions tests/scripts/check_committed_generated_files.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env python3

"""
Check that TF-PSA-Crypto files that can be regenerated are up-to-date, or update them.
"""

# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later

import scripts_path # pylint: disable=unused-import
from mbedtls_framework import config_macros
from mbedtls_framework import generate_files_helper

GENERATORS = [
config_macros.Current(shadow_missing_ok=True),
]

if __name__ == '__main__':
generate_files_helper.main(generators=GENERATORS,
description=__doc__)
46 changes: 0 additions & 46 deletions tests/scripts/check_option_lists.py

This file was deleted.

14 changes: 13 additions & 1 deletion tests/scripts/components-basic-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,21 @@ component_check_generated_files () {

# This component ends with the generated files present in the source tree.
# This is necessary for subsequent components!
}

support_check_committed_generated_files () {
# Add requirements on the Python installation here for
# the sake of check_committed_generated_files.py in mbedtls.
#
# Check the Python version, not the presence of the package,
# because the CI runs `all.sh --list-components` outside of the
# venv that has our desired packages.
:
}

component_check_committed_generated_files () {
msg "Check committed generated files"
tests/scripts/check_option_lists.py
tests/scripts/check_committed_generated_files.py
}

component_check_doxy_blocks () {
Expand Down