commit 8ae7a657acb7e35b51de4c39c4e47aba4858a11e
author Janos Follath <janos.follath@arm.com> Sat Nov 19 15:05:19 2022 +0000
committer Janos Follath <janos.follath@arm.com> Mon Nov 21 08:56:14 2022 +0000
tree 179a6be7a2b05d416d1755d39b7205e56ef07b33
parent 284672ccfb23b7a62aa730cc86012722cd794f85

Bignum tests: improve mod descriptions

There are no semantic changes to the generated tests.

Signed-off-by: Janos Follath <janos.follath@arm.com>

scripts/mbedtls_dev/bignum_common.py

diff --git a/scripts/mbedtls_dev/bignum_common.py b/scripts/mbedtls_dev/bignum_common.py
index 318e25c..9e92b8e 100644
--- a/scripts/mbedtls_dev/bignum_common.py
+++ b/scripts/mbedtls_dev/bignum_common.py
@@ -168,9 +168,14 @@
         generated to provide some context to the test case.
         """
         if not self.case_description:
-            self.case_description = "{:x} {} {:x}".format(
-                self.int_a, self.symbol, self.int_b
-            )
+            if self.arity == 1:
+                self.case_description = "{} {:x}".format(
+                    self.symbol, self.int_a
+                )
+            elif self.arity == 2:
+                self.case_description = "{:x} {} {:x}".format(
+                    self.int_a, self.symbol, self.int_b
+                )
         return super().description()
 
     @property
@@ -232,7 +237,6 @@
                     )
 
 
-
 class ModOperationCommon(OperationCommon):
     #pylint: disable=abstract-method
     """Target for bignum mod_raw test case generation."""
@@ -278,6 +282,17 @@
             return False
         return True
 
+    def description(self) -> str:
+        """Generate a description for the test case.
+
+        It uses the form A `symbol` B mod N, where symbol is used to represent
+        the operation.
+        """
+
+        if not self.case_description:
+            return super().description() + " mod {:x}".format(self.int_n)
+        return super().description()
+
     @classmethod
     def input_cases_args(cls) -> Iterator[Tuple[Any, Any, Any]]:
         if cls.arity == 1:

scripts/mbedtls_dev/bignum_mod_raw.py

diff --git a/scripts/mbedtls_dev/bignum_mod_raw.py b/scripts/mbedtls_dev/bignum_mod_raw.py
index 087c8dc..b23fbb2 100644
--- a/scripts/mbedtls_dev/bignum_mod_raw.py
+++ b/scripts/mbedtls_dev/bignum_mod_raw.py
@@ -55,6 +55,7 @@
 
     test_function = "mpi_mod_raw_to_mont_rep"
     test_name = "Convert into Mont: "
+    symbol = "R *"
     input_style = "arch_split"
     arity = 1
 
@@ -108,24 +109,17 @@
                     "947fb3baf674f74a673cf1d38126983a19ed52c7439fab42c2185"
                     ]
 
-    descr_tpl = '{} #{} N: \"{}\" A: \"{}\".'
-
     def result(self) -> List[str]:
         result = (self.int_a * self.r) % self.int_n
         return [self.format_result(result)]
 
-    def description(self) -> str:
-        return self.descr_tpl.format(self.test_name,
-                                     self.count,
-                                     self.int_n,
-                                     self.int_a)
-
 
 class BignumModRawConvertFromMont(BignumModRawConvertToMont):
     """ Test cases for mpi_mod_raw_from_mont_rep(). """
-
+    count = 0
     test_function = "mpi_mod_raw_from_mont_rep"
     test_name = "Convert from Mont: "
+    symbol = "1/R *"
 
     input_values = ["0",
                     "1",