|
- {{ all_reasons|join(" ")|safe if all_reasons else "N/A" }} + {% if all_reasons %} + {% for reason in all_reasons %} + {{ reason|e }}{% if not loop.last %} {% endif %} + {% endfor %} + {% else %} + N/A + {% endif %} |
{{ r.waiver_reason if r.waiver_reason else "N/A" }}
@@ -384,6 +402,7 @@ def generate_html(suite_summary, test_results_list, output_html_path,
# Compute total tests for summary
total_tests = (suite_summary.get('total_passed', 0) +
suite_summary.get('total_failed', 0) +
+ suite_summary.get('total_skipped', 0) +
suite_summary.get('total_warnings', 0) +
suite_summary.get('total_failed_with_waiver', 0))
@@ -398,13 +417,15 @@ def generate_html(suite_summary, test_results_list, output_html_path,
total_tests=total_tests,
total_passed=suite_summary.get("total_passed", 0),
total_failed=suite_summary.get("total_failed", 0),
+ total_skipped=suite_summary.get("total_skipped", 0),
total_warnings=suite_summary.get("total_warnings", 0),
total_failed_with_waiver=suite_summary.get("total_failed_with_waiver", 0),
test_results_list=test_results_list,
is_summary_page=is_summary_page,
include_drop_down=include_drop_down,
chart_data=chart_data,
- enumerate=enumerate
+ enumerate=enumerate,
+ get_test_status=get_test_status
)
html_content = enhance_html_report(html_content, suite_type="standalone")
@@ -429,6 +450,40 @@ def get_subtest_status(subtest_result):
return 'UNKNOWN'
+def get_test_status(test):
+ """Return a testcase status, preferring an explicit overall result."""
+ explicit = str(test.get('test_result', test.get('Test_result', ''))).strip().upper()
+ explicit_aliases = {
+ 'PASS': 'PASSED',
+ 'PASSED': 'PASSED',
+ 'FAIL': 'FAILED',
+ 'FAILED': 'FAILED',
+ 'SKIP': 'SKIPPED',
+ 'SKIPPED': 'SKIPPED',
+ 'WARNING': 'WARNINGS',
+ 'WARNINGS': 'WARNINGS',
+ 'FAILED WITH WAIVER': 'FAILED_WITH_WAIVER',
+ 'FAILED_WITH_WAIVER': 'FAILED_WITH_WAIVER',
+ 'FAILED (WITH WAIVER)': 'FAILED_WITH_WAIVER',
+ }
+ if explicit in explicit_aliases:
+ return explicit_aliases[explicit]
+
+ statuses = [
+ get_subtest_status(subtest.get('sub_test_result', {}))
+ for subtest in test.get('subtests', [])
+ ]
+ if 'FAILED' in statuses:
+ return 'FAILED'
+ if 'WARNINGS' in statuses:
+ return 'WARNINGS'
+ if 'FAILED_WITH_WAIVER' in statuses:
+ return 'FAILED_WITH_WAIVER'
+ if statuses and all(status == 'SKIPPED' for status in statuses):
+ return 'SKIPPED'
+ return 'PASSED'
+
+
def main():
parser = argparse.ArgumentParser(description='Generate HTML report from JSON data.')
parser.add_argument('input_json_files', nargs='+', help='Input JSON file(s)')
@@ -442,6 +497,7 @@ def main():
combined_suite_summary = {
'total_passed': 0,
'total_failed': 0,
+ 'total_skipped': 0,
'total_warnings':0,
'total_failed_with_waiver': 0
}
@@ -463,32 +519,22 @@ def main():
test_results_list.append(test_results)
- # Determine overall pass/fail
+ # Determine each standalone testcase's overall result. New parsers
+ # may provide an explicit result when one designated subtest is
+ # authoritative; older parsers retain subtest-based aggregation.
for test in test_results:
- has_failed_without_waiver = False
- has_failed_with_waiver = False
- has_warnings = False
-
- for subtest in test.get('subtests', []):
- st_status = get_subtest_status(subtest.get('sub_test_result', {}))
- if st_status == 'WARNINGS':
- has_warnings = True
- elif st_status == 'FAILED':
- has_failed_without_waiver = True
- elif st_status == 'FAILED_WITH_WAIVER':
- has_failed_with_waiver = True
-
- if has_failed_without_waiver:
- combined_suite_summary['total_failed'] += 1
- elif has_warnings:
- combined_suite_summary['total_warnings'] += 1
- elif has_failed_with_waiver:
- combined_suite_summary['total_failed_with_waiver'] += 1
- else:
- combined_suite_summary['total_passed'] += 1
+ status_key = {
+ 'PASSED': 'total_passed',
+ 'FAILED': 'total_failed',
+ 'SKIPPED': 'total_skipped',
+ 'WARNINGS': 'total_warnings',
+ 'FAILED_WITH_WAIVER': 'total_failed_with_waiver',
+ }[get_test_status(test)]
+ combined_suite_summary[status_key] += 1
total_standalones = (combined_suite_summary['total_passed'] +
combined_suite_summary['total_failed'] +
+ combined_suite_summary['total_skipped'] +
combined_suite_summary['total_warnings'] +
combined_suite_summary['total_failed_with_waiver'])
if total_standalones == 0:
diff --git a/common/log_parser/standalone_tests/logs_to_json.py b/common/log_parser/standalone_tests/logs_to_json.py
index b1d4dd90..06a8d610 100755
--- a/common/log_parser/standalone_tests/logs_to_json.py
+++ b/common/log_parser/standalone_tests/logs_to_json.py
@@ -77,6 +77,14 @@
"Test_suite_description": "Validates that the Devicetree Blob address satisfies the required alignment constraints.",
"Test_case_description": "Checks that the DTB table address is non-zero and aligned to an 8-byte boundary."
},
+ "pcie_option_rom_arch_audit": {
+ "Test_suite": "PCIeOptionRomArchAudit",
+ "Test_suite_description": "PCIe Option ROM architecture validation",
+ "Test_case_description": (
+ "Verify that PCIe Option ROM images contain a supported AArch64 UEFI "
+ "image for the platform."
+ )
+ },
}
def create_subtest(subtest_number, description, status, reason=""):
@@ -1617,6 +1625,150 @@ def parse_runtime_dev_map_conflict(log_data):
}
+PCIE_OPTION_ROM_BANNER = re.compile(
+ r'^\s*PcieOptionRomArchAudit:\s*',
+ re.IGNORECASE | re.MULTILINE,
+)
+PCIE_OPTION_ROM_FOUND = re.compile(
+ r'Scanned\s+\d+\s+EFI_PCI_IO\s+handles\s+and\s+found\s+(\d+)\s+'
+ r'PCIe\s+devices\s+with\s+Option\s+ROM\s+images\s*:',
+ re.IGNORECASE,
+)
+PCIE_OPTION_ROM_TOTAL = re.compile(
+ r'^\s*PCIe\s+devices\s+with\s+ROM\s*:\s*(\d+)\s*$',
+ re.IGNORECASE,
+)
+PCIE_OPTION_ROM_NON_COMPLIANT = re.compile(
+ r'^\s*Non-compliant\s+devices\s*:\s*(\d+)\s*$',
+ re.IGNORECASE,
+)
+
+
+def _single_pcie_count(lines, pattern, field_name):
+ """Return one required non-negative PCIe audit count."""
+ matches = [int(match.group(1)) for line in lines if (match := pattern.search(line))]
+ if len(matches) != 1:
+ raise ValueError(
+ f"PcieOptionRomArchAudit record must contain exactly one {field_name}; "
+ f"found {len(matches)}."
+ )
+ return matches[0]
+
+
+def _remove_empty_reason_lists(subtest):
+ result = subtest["sub_test_result"]
+ for key in (
+ "pass_reasons",
+ "fail_reasons",
+ "abort_reasons",
+ "skip_reasons",
+ "warning_reasons",
+ ):
+ if not result.get(key):
+ result.pop(key, None)
+
+
+def parse_pcie_option_rom_arch_audit_log(log_data):
+ """Parse one or more complete PcieOptionRomArchAudit result records."""
+ clean_lines = [re.sub(ansi_escape, "", line).rstrip("\r\n") for line in log_data]
+ record_starts = [
+ index for index, line in enumerate(clean_lines) if PCIE_OPTION_ROM_BANNER.match(line)
+ ]
+ if not record_starts:
+ raise ValueError("PcieOptionRomArchAudit record banner was not found.")
+
+ records = []
+ for index, start in enumerate(record_starts):
+ end = record_starts[index + 1] if index + 1 < len(record_starts) else len(clean_lines)
+ records.append(clean_lines[start:end])
+
+ mapping = test_suite_mapping["pcie_option_rom_arch_audit"]
+ suite_summary = {
+ "total_passed": 0,
+ "total_failed": 0,
+ "total_skipped": 0,
+ "total_aborted": 0,
+ "total_warnings": 0,
+ "total_failed_with_waiver": 0,
+ }
+ test_results = []
+
+ for record in records:
+ devices_with_rom = _single_pcie_count(
+ record,
+ PCIE_OPTION_ROM_FOUND,
+ "'Scanned ... found |