AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Normalize whitespace in test arguments

Browse Source 
Avoid ending up with test cases that only differ in whitespace in an
argument.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-04-21 15:36:58 +02:00
parent c5d086f6ae
commit cccd1ac373
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/mbedtls_dev/macro_collector.py
View File

@ -131,7 +131,11 @@ class PSAMacroEnumerator:
@staticmethod @staticmethod
def _format_arguments(name: str, arguments: Iterable[str]) -> str: def _format_arguments(name: str, arguments: Iterable[str]) -> str:
"""Format a macro call with arguments..""" """Format a macro call with arguments.
The resulting format is consistent with
`InputsForTest.normalize_argument`.
"""
return name + '(' + ', '.join(arguments) + ')' return name + '(' + ', '.join(arguments) + ')'
_argument_split_re = re.compile(r' *, *') _argument_split_re = re.compile(r' *, *')
@ -440,6 +444,15 @@ enumerate
raise Exception('Undeclared names in test case', undeclared) raise Exception('Undeclared names in test case', undeclared)
return True return True
@staticmethod
def normalize_argument(argument: str) -> str:
"""Normalize whitespace in the given C expression.
The result uses the same whitespace as
` PSAMacroEnumerator.distribute_arguments`.
"""
return re.sub(r',', r', ', re.sub(r' +', r'', argument))
def add_test_case_line(self, function: str, argument: str) -> None: def add_test_case_line(self, function: str, argument: str) -> None:
"""Parse a test case data line, looking for algorithm metadata tests.""" """Parse a test case data line, looking for algorithm metadata tests."""
sets = [] sets = []
@ -454,7 +467,7 @@ enumerate
sets += self.table_by_test_function[function] sets += self.table_by_test_function[function]
if self.accept_test_case_line(function, argument): if self.accept_test_case_line(function, argument):
for s in sets: for s in sets:
s.add(argument) s.add(self.normalize_argument(argument))
# Regex matching a *.data line containing a test function call and # Regex matching a *.data line containing a test function call and
# its arguments. The actual definition is partly positional, but this # its arguments. The actual definition is partly positional, but this