Merge pull request #41 from gabor-mezei-arm/9325_move_config.py_to_framework

Move `config.py` functionalities to the framework

Author: ronald-cron-arm

scripts/generate_config_tests.py

@@ -5,18 +5,18 @@
 # 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
 
 import project_scripts # pylint: disable=unused-import
 import config
+from mbedtls_framework import config_common
 from mbedtls_framework import test_case
 from mbedtls_framework import test_data_generation
 
 
-def single_setting_case(setting: config.Setting, when_on: bool,
+def single_setting_case(setting: config_common.Setting, when_on: bool,
                         dependencies: List[str],
                         note: Optional[str]) -> test_case.TestCase:
     """Construct a test case for a boolean setting.
@@ -64,8 +64,8 @@ def single_setting_case(setting: config.Setting, when_on: bool,
     'MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS': 'MBEDTLS_PSA_CRYPTO_C',
 }
 
-def dependencies_of_setting(cfg: config.Config,
-                            setting: config.Setting) -> Optional[str]:
+def dependencies_of_setting(cfg: config_common.Config,
+                            setting: config_common.Setting) -> Optional[str]:
     """Return dependencies without which a setting is not meaningful.
 
     The dependencies of a setting express when a setting can be enabled and
@@ -112,8 +112,8 @@ def dependencies_of_setting(cfg: config.Config,
         return m.group('prefix') + 'BASIC'
     return None
 
-def conditions_for_setting(cfg: config.Config,
-                           setting: config.Setting
+def conditions_for_setting(cfg: config_common.Config,
+                           setting: config_common.Setting
                            ) -> Iterator[Tuple[List[str], str]]:
     """Enumerate the conditions under which to test the given setting.
 
@@ -142,7 +142,7 @@ def conditions_for_setting(cfg: config.Config,
     yield [], ''
 
 
-def enumerate_boolean_setting_cases(cfg: config.Config
+def enumerate_boolean_setting_cases(cfg: config_common.Config
                                    ) -> Iterable[test_case.TestCase]:
     """Emit test cases for all boolean settings."""
     for name in sorted(cfg.settings.keys()):
@@ -159,15 +159,10 @@ class ConfigTestGenerator(test_data_generation.TestGenerator):
     """Generate test cases for configuration reporting."""
 
     def __init__(self, settings):
-        # 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, no-member
-        self.mbedtls_config = config.ConfigFile() if is_3_6 else config.MbedTLSConfig()
+        self.mbedtls_config = 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.CryptoConfig()
         self.targets['test_suite_config.psa_boolean'] = \
             lambda: enumerate_boolean_setting_cases(self.psa_config)
         super().__init__(settings)