Skip to content

Commit 6f6d2e2

Browse files
boomanaiden154vinay-deshmukh
authored andcommitted
[CI][NFC] Generalize _format_ninja_failures
This is actually perfectly applicable to the test failure case as well and results in some easy code consolidation/deletion. Reviewers: dschuff, lnihlen, gburgessiv, Keenuts, DavidSpickett Reviewed By: Keenuts, DavidSpickett Pull Request: llvm#166589
1 parent d0f2f5c commit 6f6d2e2

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

.ci/generate_test_report_lib.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ def find_failure_in_ninja_logs(ninja_logs: list[list[str]]) -> list[tuple[str, s
8282
return failures
8383

8484

85-
def _format_ninja_failures(ninja_failures: list[tuple[str, str]]) -> list[str]:
86-
"""Formats ninja failures into summary views for the report."""
85+
def _format_failures(failures: list[tuple[str, str]]) -> list[str]:
86+
"""Formats failures into summary views for the report."""
8787
output = []
88-
for build_failure in ninja_failures:
88+
for build_failure in failures:
8989
failed_action, failure_message = build_failure
9090
output.extend(
9191
[
@@ -176,7 +176,7 @@ def generate_report(
176176
"",
177177
]
178178
)
179-
report.extend(_format_ninja_failures(ninja_failures))
179+
report.extend(_format_failures(ninja_failures))
180180
report.extend(
181181
[
182182
"",
@@ -212,18 +212,7 @@ def plural(num_tests):
212212

213213
for testsuite_name, failures in failures.items():
214214
report.extend(["", f"### {testsuite_name}"])
215-
for name, output in failures:
216-
report.extend(
217-
[
218-
"<details>",
219-
f"<summary>{name}</summary>",
220-
"",
221-
"```",
222-
output,
223-
"```",
224-
"</details>",
225-
]
226-
)
215+
report.extend(_format_failures(failures))
227216
elif return_code != 0:
228217
# No tests failed but the build was in a failed state. Bring this to the user's
229218
# attention.
@@ -248,7 +237,7 @@ def plural(num_tests):
248237
"",
249238
]
250239
)
251-
report.extend(_format_ninja_failures(ninja_failures))
240+
report.extend(_format_failures(ninja_failures))
252241

253242
if failures or return_code != 0:
254243
report.extend(["", UNRELATED_FAILURES_STR])

0 commit comments

Comments
 (0)