From 4dbb36c3f29a3ff7e700500772d3d83f3395ce90 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 11 Mar 2025 11:22:14 +0100 Subject: [PATCH] Adapt generate_config_tests.py Do not generate test_suite_config.psa_boolean.data in Mbed TLS 4.x. It is generated in TF-PSA-Crypto context in that case. Signed-off-by: Ronald Cron --- scripts/generate_config_tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index e3c1d8ddc..013fc0680 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -12,6 +12,7 @@ from typing import Iterable, Iterator, List, Optional, Tuple import project_scripts # pylint: disable=unused-import import config +from mbedtls_framework import build_tree from mbedtls_framework import config_common from mbedtls_framework import test_case from mbedtls_framework import test_data_generation @@ -172,9 +173,10 @@ class ConfigTestGenerator(test_data_generation.TestGenerator): 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) + if build_tree.is_mbedtls_3_6(): + 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'] = \