Skip to content

Test tooling: Use stricter regex for lines in expected_results.txt files, provide readable errors for format errors #5948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 5 commits into from
Dec 11, 2025
Merged

Test tooling: Use stricter regex for lines in expected_results.txt files, provide readable errors for format errors #5948

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f112d5f
More strict regex for lines in expected_results.txt files, report rea…
vmichal Dec 7, 2025
affcd92
Minor rewording of errors.
vmichal Dec 7, 2025
eb8afe8
Make `_EXPECTED_RESULT_REGEX` even stricter.
StephanTLavavej Dec 10, 2025
226ff81
Use single quotes to avoid escaping double quotes.
StephanTLavavej Dec 10, 2025
f874706
Improve message wording.
StephanTLavavej Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/utils/stl/test/file_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class _ParseCtx:
_TAGS_REGEX = re.compile(r'^(?P<tags>(\*|\w+(,\w+)*))\t+(?P<remainder>.*)$')
_ENV_VAR_MULTI_ITEM_REGEX = re.compile(r'(?P<name>\w+)="(?P<value>.*?)"')
_CROSSLIST_REGEX = re.compile(r'^RUNALL_CROSSLIST$')
_EXPECTED_RESULT_REGEX = re.compile(r'^(?P<prefix>.*) (?P<result>.*?)$')
_EXPECTED_RESULT_REGEX = re.compile(r'^(?P<prefix>[^ ]+) (?P<result>\w+)$')


def _parse_env_line(line: str) -> Optional[_TmpEnvEntry]:
Expand Down Expand Up @@ -138,11 +138,15 @@ def parse_result_file(filename: Union[str, bytes, os.PathLike]) \
res = dict()
for line in parse_commented_file(filename):
m = _EXPECTED_RESULT_REGEX.match(line)
if m is None:
raise Exception(f'Incorrectly formatted line "{line}" in {filename}.')
prefix = m.group("prefix")
result = m.group("result")
result_code = getattr(lit.Test, result, None)
if result_code is None:
result_code = getattr(stl.test.tests, result)
result_code = getattr(stl.test.tests, result, None)
if result_code is None:
raise Exception(f'Unknown result code "{result}" in line "{line}" in {filename}.')
res[prefix] = result_code

_expected_result_entry_cache[str(filename)] = res
Expand Down