Skip to content

xBSA log parser update for latest format and DT edk2 and sct upgrade #621

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
chetan-rathore merged 1 commit into from
Feb 1, 2026
Merged

xBSA log parser update for latest format and DT edk2 and sct upgrade #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions common/config/systemready-dt-band-source.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ LINUX_KERNEL_VERSION=6.16

# EDK2 build tag/commit
# SRC: https://github.com/tianocore/edk2.git
EDK2_SRC_TAG=edk2-stable202508
EDK2_SRC_TAG=edk2-stable202511

# EDK2-TEST build tag/commit
# SRC: https://github.com/tianocore/edk2-test
SCT_SRC_TAG=edk2-test-stable202509
SCT_SRC_TAG=91e998d2d77b26cccd1f4bf99938ff55c1606e8a

#FWTS build tag/commit
# The flag is not used for SR build, but is kept as reference to know which latest version is used
Expand All @@ -67,11 +67,11 @@ ARM_BBR_TAG=""

# edk2-test-parser version
# SRC: https://gitlab.arm.com/systemready/edk2-test-parser
EDK2_TEST_PARSER_TAG=96352c02ee437586cfb2aebc2f8538673d8ac476
EDK2_TEST_PARSER_TAG=""

# systemready-scripts tag/commit
# SRC: https://gitlab.arm.com/systemready/systemready-scripts
SYSTEMREADY_SCRIPTS_TAG=41d96ceb693b22f6226b22e2e9f610e8c3d5098e
SYSTEMREADY_SCRIPTS_TAG=""

# Latest commit where ledge efi http label enhancement is merged upstream
LEDGE_EFI_TAG="d3062dd3b47282ea10f0e6e08858ca0c21596169"
Expand Down
115 changes: 114 additions & 1 deletion common/log_parser/bsa/logs_to_json.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,130 @@ def main(input_files, output_file):
if not line:
continue

# Start processing when we see Selected rules or Running tests or START
# Start processing when we see Selected rules / Running tests / START (old format)
# or "*** Running <suite> tests ***" (new format)
if not processing and (
"---------------------- Running tests ------------------------" in line
or line.startswith("Selected rules:")
or line.startswith("START ")
or line.startswith("*** Running ")
):
processing = True

if not processing:
continue

# ---------------- New log format support ----------------
# Newer BSA logs can look like:
# *** Running <SUITE> tests ***
# <RULE_ID> : <index> : <description>
# Result: <status text>
suite_hdr = re.match(r'^\*\*\*\s+Running\s+(.+?)\s+tests\s+\*\*\*$', line)
if suite_hdr:
current_suite = suite_hdr.group(1).strip().replace(" ", "_")
continue

# RULE line (main or subtest, determined by indentation)
rule_line = re.match(r'^([A-Za-z0-9_]+)\s*:\s*([^:]+?)\s*:\s*(.*)$', line)
if rule_line:
rule_id = rule_line.group(1).strip()
test_index = (rule_line.group(2) or "").strip() or "-"
desc = (rule_line.group(3) or "").strip()
suite = current_suite or ""

if not is_indented:
# Main rule: start a new parent context
meta = {
"suite": suite,
"rule_id": rule_id,
"index": test_index,
"description": desc,
"subtests": []
}
active_main[rule_id] = meta
# reset stack to this main rule (prevents accidental nesting across rules)
parent_stack[:] = [rule_id]
else:
# Subtest: attach to nearest main rule in the stack (if any)
parent_id = None
for rid in reversed(parent_stack):
if rid in active_main:
parent_id = rid
break
meta = {
"suite": suite,
"rule_id": rule_id,
"index": test_index,
"description": desc,
"parent": parent_id,
"is_indented": is_indented
}
active_sub[rule_id] = meta
parent_stack.append(rule_id)

continue

# Result line (belongs to the last opened rule in new-format logs)
if line.upper().startswith("RESULT:"):
status_text = line.split(":", 1)[1].strip()
if not parent_stack:
continue

rule_id = parent_stack[-1]
formatted_result, summary_category = classify_status(status_text)

# Subtest completion
if rule_id in active_sub:
sub_meta = active_sub.pop(rule_id)
parent_id = sub_meta.get("parent")
if parent_id and parent_id in active_main:
parent_meta = active_main[parent_id]
sub_entry = {
"sub_Test_Number": f"{rule_id} : {sub_meta.get('index', '-')}",
"sub_Rule_ID": rule_id,
"sub_Test_Description": sub_meta.get("description", ""),
"sub_test_result": formatted_result
}
parent_meta["subtests"].append(sub_entry)

# Pop this subtest from the stack
parent_stack.pop()
continue

# Main testcase completion
if rule_id in active_main:
meta = active_main.pop(rule_id)

# Pop main from stack
if parent_stack and parent_stack[-1] == rule_id:
parent_stack.pop()

suite = meta.get("suite", "")
desc = meta.get("description", "")
index = meta.get("index", "-")
subtests = meta.get("subtests", [])

testcase = {
"Test_case": f"{rule_id} : {index}",
"Test_case_description": desc,
"Test_result": formatted_result
}
if subtests:
testcase["subtests"] = subtests

tcs = init_summary()
update_summary_counts(tcs, summary_category, formatted_result)
testcase["Test_case_summary"] = tcs

testcases_per_suite[suite].append(testcase)
update_summary_counts(suite_summaries[suite], summary_category, formatted_result)
update_summary_counts(total_summary, summary_category, formatted_result)

continue

continue
# -------------- End new log format support --------------

# START <suite_or_dash> <RULE_ID> <index_or_dash> : <description...>
start_match = re.match(
r'^START\s+([^\s:]+)\s+([A-Za-z0-9_]+)\s+([^\s:]+)\s*:\s*(.*)$',
Expand Down