commit 0d07e86a4451649e2da90428518f5d86f4870234
author Werner Lewis <werner.lewis@arm.com> Fri Sep 02 11:56:34 2022 +0100
committer Werner Lewis <werner.lewis@arm.com> Wed Sep 21 17:07:37 2022 +0100
tree 2b010d7c4d4d80b2dbcb8943270d4348ff54b1d2
parent 6cc5e5f0d9c68d96e7fa0937f479378d5ad0eab2

Rework TestGenerator to add file targets

BaseTarget-derived targets are now added to TestGenerator.targets in
initialization. This reduces repeated code in generate_xxx_tests.py
scripts which use this framework.

Signed-off-by: Werner Lewis <werner.lewis@arm.com>

tests/scripts/generate_bignum_tests.py

diff --git a/tests/scripts/generate_bignum_tests.py b/tests/scripts/generate_bignum_tests.py
index b08ba37..f613680 100755
--- a/tests/scripts/generate_bignum_tests.py
+++ b/tests/scripts/generate_bignum_tests.py
@@ -231,12 +231,5 @@
         return quote_str(hex(self.int_l + self.int_r).replace("0x", "", 1))
 
 
-class BignumTestGenerator(test_generation.TestGenerator):
-    """Test generator subclass, for bignum file Targets."""
-    TARGETS = {
-        subclass.target_basename: subclass.generate_tests for subclass in
-        test_generation.BaseTarget.__subclasses__()
-    } # type: Dict[str, Callable[[], Iterable[test_case.TestCase]]]
-
 if __name__ == '__main__':
-    test_generation.main(sys.argv[1:], BignumTestGenerator)
+    test_generation.main(sys.argv[1:])

tests/scripts/generate_psa_tests.py

diff --git a/tests/scripts/generate_psa_tests.py b/tests/scripts/generate_psa_tests.py
index ebec2ee..1f516c9 100755
--- a/tests/scripts/generate_psa_tests.py
+++ b/tests/scripts/generate_psa_tests.py
@@ -898,7 +898,7 @@
     """Test generator subclass including PSA targets and info."""
     # Note that targets whose names contain 'test_format' have their content
     # validated by `abi_check.py`.
-    TARGETS = {
+    targets = {
         'test_suite_psa_crypto_generate_key.generated':
         lambda info: KeyGenerate(info).test_cases_for_key_generation(),
         'test_suite_psa_crypto_not_supported.generated':