Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-08-28 13:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from gabor-mezei-arm/9157_config.py_multiple_config

Browse Source 
Update for TF-PSA-Crypto `config.py`
This commit is contained in:
Ronald Cron
2024-12-09 08:07:35 +01:00
committed by GitHub
parent a2c76945ca d4585fde2c
commit 150bf84281
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/generate_config_tests.py
+15 -6
View File
@@ -5,6 +5,7 @@
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
import inspect
import re
import sys
from typing import Iterable, Iterator, List, Optional, Tuple
@@ -164,12 +165,20 @@ class ConfigTestGenerator(test_data_generation.TestGenerator):
"""Generate test cases for configuration reporting."""
def __init__(self, settings):
self.mbedtls_config = config.MbedTLSConfig()
self.targets['test_suite_config.mbedtls_boolean'] = \
lambda: enumerate_boolean_setting_cases(self.mbedtls_config)
self.psa_config = config.CryptoConfig()
self.targets['test_suite_config.psa_boolean'] = \
lambda: enumerate_boolean_setting_cases(self.psa_config)
# pylint: disable=no-member
config_members = dict(inspect.getmembers(config))
if 'MbedTLSConfig' in config_members:
self.mbedtls_config = config.MbedTLSConfig()
self.targets['test_suite_config.mbedtls_boolean'] = \
lambda: enumerate_boolean_setting_cases(self.mbedtls_config)
if 'CryptoConfig' in config_members:
self.psa_config = config.CryptoConfig()
self.targets['test_suite_config.psa_boolean'] = \
lambda: enumerate_boolean_setting_cases(self.psa_config)
elif 'TFPSACryptoConfig' in config_members:
self.psa_config = config.TFPSACryptoConfig()
self.targets['test_suite_config.psa_boolean'] = \
lambda: enumerate_boolean_setting_cases(self.psa_config)
super().__init__(settings)
scripts/mbedtls_framework/config_common.py
+4 -3
View File
@@ -228,9 +228,10 @@ class ConfigFile(metaclass=ABCMeta):
if os.path.lexists(candidate):
filename = candidate
break
else:
raise FileNotFoundError(f'{name} configuration file not found: '
f'{filename if filename else default_path}')
if not os.path.lexists(filename):
raise FileNotFoundError(f'{name} configuration file not found: '
f'{filename if filename else default_path}')
self.filename = filename
self.templates = []