Skip to content

Add JSON and HTML reporting for Devicetree memory-map tests #802

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
Sep 17, 2026
Merged

Add JSON and HTML reporting for Devicetree memory-map tests #802

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: 8 additions & 0 deletions common/log_parser/acs-results-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,6 +1639,9 @@
"Suite_Name: Mandatory : DT_VALIDATE_compliance": {
"type": "string"
},
"Suite_Name: Mandatory : DTB_ALIGNMENT_compliance": {
"type": "string"
},
"Suite_Name: Mandatory : ETHTOOL_TEST_compliance": {
"type": "string"
},
Expand Down Expand Up @@ -1666,6 +1669,9 @@
"Suite_Name: Mandatory : READ_WRITE_CHECK_BLK_DEVICES_compliance": {
"type": "string"
},
"Suite_Name: Mandatory : RESERVED_MEMORY_MAP_compliance": {
"type": "string"
},
"Suite_Name: Recommended : BSA_compliance": {
"type": "string"
},
Expand Down Expand Up @@ -1728,9 +1734,11 @@
"required": [
"Suite_Name: Mandatory : Capsule Update_compliance",
"Suite_Name: Mandatory : DT_VALIDATE_compliance",
"Suite_Name: Mandatory : DTB_ALIGNMENT_compliance",
"Suite_Name: Mandatory : ETHTOOL_TEST_compliance",
"Suite_Name: Mandatory : EBBR-FWTS_compliance",
"Suite_Name: Mandatory : READ_WRITE_CHECK_BLK_DEVICES_compliance",
"Suite_Name: Mandatory : RESERVED_MEMORY_MAP_compliance",
"Suite_Name: Mandatory : EBBR-SCT_compliance",
"Suite_Name: Mandatory : OS_ethtool_test_linux-Fedora-40_compliance",
"Suite_Name: Mandatory : OS_ethtool_test_linux-Tumbleweed_compliance",
Expand Down
2 changes: 2 additions & 0 deletions common/log_parser/enrich_suite_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
"PSCI",
"READ-WRITE-CHECK-BLK-DEVICES",
"RUNTIME-DEV-MAP",
"RESERVED-MEMORY-MAP",
"DTB-ALIGNMENT",
"SMBIOS",
}

Expand Down
29 changes: 29 additions & 0 deletions common/log_parser/main_log_parser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,35 @@ if [ $YOCTO_FLAG_PRESENT -eq 1 ]; then
echo -e "${RED}ERROR: Runtime device mapping log parsing to json failed.${NC}"
fi
fi
# 10) RESERVED MEMORY MAP
RESERVED_MEM_MAP_LOG="$LINUX_TOOLS_LOGS_PATH/reserved_memory_map_test.log"
RESERVED_MEM_MAP_JSON="$JSONS_DIR/reserved_memory_map.json"
if check_file "$RESERVED_MEM_MAP_LOG" "M"; then
python3 "$SCRIPTS_PATH/standalone_tests/logs_to_json.py" \
"$RESERVED_MEM_MAP_LOG" \
"$RESERVED_MEM_MAP_JSON"
if [ $? -eq 0 ]; then
Standalone_JSONS+=("$RESERVED_MEM_MAP_JSON")
apply_waivers "Standalone" "$RESERVED_MEM_MAP_JSON"
else
echo -e "${RED}ERROR: Reserved memory map log parsing to json failed.${NC}"
fi
fi

# 11) DTB ALIGNMENT
DTB_ALIGNMENT_LOG="$LINUX_TOOLS_LOGS_PATH/dtb_alignment_test.log"
DTB_ALIGNMENT_JSON="$JSONS_DIR/dtb_alignment.json"
if check_file "$DTB_ALIGNMENT_LOG" "M"; then
python3 "$SCRIPTS_PATH/standalone_tests/logs_to_json.py" \
"$DTB_ALIGNMENT_LOG" \
"$DTB_ALIGNMENT_JSON"
if [ $? -eq 0 ]; then
Standalone_JSONS+=("$DTB_ALIGNMENT_JSON")
apply_waivers "Standalone" "$DTB_ALIGNMENT_JSON"
else
echo -e "${RED}ERROR: DTB alignment log parsing to json failed.${NC}"
fi
fi

# Now generate a single STANDALONE HTML
if [ ${#Standalone_JSONS[@]} -gt 0 ]; then
Expand Down
13 changes: 11 additions & 2 deletions common/log_parser/merge_jsons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,12 @@ def merge_json_files(json_files, output_file):
elif "NETWORK_BOOT" in fn or "network_boot" in fn.lower():
section_name = "Suite_Name: Network boot"
suite_key = "NETWORK_BOOT"
elif "reserved_memory_map" in fn.lower():
section_name = "Suite_Name: Reserved Memory Map"
suite_key = "RESERVED_MEMORY_MAP"
elif "dtb_alignment" in fn.lower():
section_name = "Suite_Name: DTB Alignment"
suite_key = "DTB_ALIGNMENT"
elif "SMBIOS" in fn:
section_name = "Suite_Name: SMBIOS"
suite_key = "SMBIOS"
Expand Down Expand Up @@ -472,7 +478,8 @@ def merge_json_files(json_files, output_file):
lookup_suite_key = suite_key.lower()
standalone_aliases = {
"dt_kselftest", "dt_validate", "ethtool_test",
"read_write_check_blk_devices", "psci", "capsule update", "network_boot", "smbios", "runtime_dev_map"
"read_write_check_blk_devices", "psci", "capsule update", "network_boot", "smbios", "runtime_dev_map" ,
"reserved_memory_map", "dtb_alignment"
}
if lookup_suite_key in standalone_aliases or lookup_suite_key.startswith("os_"):
lookup_suite_key = "standalone"
Expand Down Expand Up @@ -813,7 +820,9 @@ def _is_missing(val: str) -> bool:
"Suite_Name: PSCI": "Suite_Name: Standalone",
"Suite_Name: SMBIOS": "Suite_Name: Standalone",
"Suite_Name: Network boot": "Suite_Name: Standalone",
"Suite_Name: Runtime device mapping": "Suite_Name: Standalone"
"Suite_Name: Runtime device mapping": "Suite_Name: Standalone",
"Suite_Name: Reserved Memory Map": "Suite_Name: Standalone",
"Suite_Name: DTB Alignment": "Suite_Name: Standalone",
}

def _entry_to_list(entry):
Expand Down
Loading
Loading