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

Update for TF-PSA-Crypto `config.py`

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 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()
+        # pylint: disable=no-member
-        self.targets['test_suite_config.mbedtls_boolean'] = \
+        config_members = dict(inspect.getmembers(config))
-            lambda: enumerate_boolean_setting_cases(self.mbedtls_config)
+        if 'MbedTLSConfig' in config_members:
-        self.psa_config = config.CryptoConfig()
+            self.mbedtls_config = config.MbedTLSConfig()
-        self.targets['test_suite_config.psa_boolean'] = \
+            self.targets['test_suite_config.mbedtls_boolean'] = \
-            lambda: enumerate_boolean_setting_cases(self.psa_config)
+                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

@@ -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: '
+        if not os.path.lexists(filename):
-                                        f'{filename if filename else default_path}')
+            raise FileNotFoundError(f'{name} configuration file not found: '
+                                    f'{filename if filename else default_path}')
 
         self.filename = filename
         self.templates = []