From 05433e9097fb98a015629ba23aad137ebf46e8a2 Mon Sep 17 00:00:00 2001 From: Gabor Mezei Date: Mon, 8 Jul 2024 16:05:55 +0200 Subject: [PATCH 1/4] Use updated config.py classes Let the default config file determined by the `CryptoConfig` class. Signed-off-by: Gabor Mezei --- scripts/generate_config_tests.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index d1991c0dc..400743d28 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -5,7 +5,6 @@ # Copyright The Mbed TLS Contributors # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later -import os import re import sys from typing import Iterable, Iterator, List, Optional, Tuple @@ -159,17 +158,10 @@ class ConfigTestGenerator(test_data_generation.TestGenerator): """Generate test cases for configuration reporting.""" def __init__(self, settings): - self.mbedtls_config = config.ConfigFile() + self.mbedtls_config = config.MbedTLSConfig() self.targets['test_suite_config.mbedtls_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.mbedtls_config) - # Temporary, while Mbed TLS does not just rely on the TF-PSA-Crypto - # build system to build its crypto library. When it does, the first - # case can just be removed. - if os.path.isdir('tf-psa-crypto'): - crypto_config_file = 'tf-psa-crypto/include/psa/crypto_config.h' - else: - crypto_config_file = 'include/psa/crypto_config.h' - self.psa_config = config.ConfigFile(crypto_config_file) + self.psa_config = config.CryptoConfig() self.targets['test_suite_config.psa_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.psa_config) super().__init__(settings) From a758beb103e7615e2ed0abbbdb3b0a5edb6ad695 Mon Sep 17 00:00:00 2001 From: Gabor Mezei Date: Tue, 16 Jul 2024 12:48:09 +0200 Subject: [PATCH 2/4] Add compatibility with 3.6 Use the old `ConfigFile` class for the 3.6 Signed-off-by: Gabor Mezei --- scripts/generate_config_tests.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index 400743d28..69bbb8f5c 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -5,6 +5,7 @@ # Copyright The Mbed TLS Contributors # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later +import abc import re import sys from typing import Iterable, Iterator, List, Optional, Tuple @@ -158,10 +159,13 @@ class ConfigTestGenerator(test_data_generation.TestGenerator): """Generate test cases for configuration reporting.""" def __init__(self, settings): - self.mbedtls_config = config.MbedTLSConfig() + # Temporarily use different config classes for 3.6. With the config.py moving to + # the framework it will be unified. + is_3_6 = not isinstance(config.ConfigFile, abc.ABCMeta) + self.mbedtls_config = config.ConfigFile() if is_3_6 else config.MbedTLSConfig() self.targets['test_suite_config.mbedtls_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.mbedtls_config) - self.psa_config = config.CryptoConfig() + self.psa_config = config.ConfigFile('include/psa/crypto_config.h') if is_3_6 else config.CryptoConfig() self.targets['test_suite_config.psa_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.psa_config) super().__init__(settings) From e8b041bcd68c383bb769dba632c01e7503ff0e99 Mon Sep 17 00:00:00 2001 From: Gabor Mezei Date: Wed, 17 Jul 2024 12:09:46 +0200 Subject: [PATCH 3/4] Fix pylint issues Signed-off-by: Gabor Mezei --- scripts/generate_config_tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index 69bbb8f5c..492bcc815 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -162,10 +162,12 @@ class ConfigTestGenerator(test_data_generation.TestGenerator): # Temporarily use different config classes for 3.6. With the config.py moving to # the framework it will be unified. is_3_6 = not isinstance(config.ConfigFile, abc.ABCMeta) + # pylint: disable=no-value-for-parameter self.mbedtls_config = config.ConfigFile() if is_3_6 else config.MbedTLSConfig() self.targets['test_suite_config.mbedtls_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.mbedtls_config) - self.psa_config = config.ConfigFile('include/psa/crypto_config.h') if is_3_6 else config.CryptoConfig() + self.psa_config = config.ConfigFile('include/psa/crypto_config.h') if is_3_6 else \ + config.CryptoConfig() self.targets['test_suite_config.psa_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.psa_config) super().__init__(settings) From 35b0e3495e0db4520e5646abd9ed246084b0f6ee Mon Sep 17 00:00:00 2001 From: Gabor Mezei Date: Tue, 30 Jul 2024 12:09:40 +0200 Subject: [PATCH 4/4] Fix pylint issue Signed-off-by: Gabor Mezei --- scripts/generate_config_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index 492bcc815..3438f8460 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -162,7 +162,7 @@ class ConfigTestGenerator(test_data_generation.TestGenerator): # Temporarily use different config classes for 3.6. With the config.py moving to # the framework it will be unified. is_3_6 = not isinstance(config.ConfigFile, abc.ABCMeta) - # pylint: disable=no-value-for-parameter + # pylint: disable=no-value-for-parameter, no-member self.mbedtls_config = config.ConfigFile() if is_3_6 else config.MbedTLSConfig() self.targets['test_suite_config.mbedtls_boolean'] = \ lambda: enumerate_boolean_setting_cases(self.mbedtls_config)