From 4b6317ed14ca16c43a402c91aa79ccd9bc9f66d0 Mon Sep 17 00:00:00 2001 From: Dennis Song Date: Mon, 11 Dec 2023 11:04:58 +0800 Subject: [PATCH] compare_cts_reports: do not show ignored ABI in the sheet Do not show the ABI name in the compare result spread sheet if `--ignore-abi` was specified when generating the csv diff file. Bug: 315073470 Test: compare_cts_reports.py and generate_spread_sheet.py Change-Id: I3cd015dd24e6597a4f8453c73638f1302c8e6fb7 --- tools/compare_cts_reports/constant.py | 2 ++ tools/compare_cts_reports/generate_spread_sheet.py | 5 ++++- tools/compare_cts_reports/parse_cts_report.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/compare_cts_reports/constant.py b/tools/compare_cts_reports/constant.py index c409e909a..8c5dc72fa 100755 --- a/tools/compare_cts_reports/constant.py +++ b/tools/compare_cts_reports/constant.py @@ -22,3 +22,5 @@ VERSION = '1.0' NO_DATA = 'null' TESTED_ITEMS = 'tested_items' PASS_RATE = 'pass_rate' + +ABI_IGNORED = 'abi-ignored' diff --git a/tools/compare_cts_reports/generate_spread_sheet.py b/tools/compare_cts_reports/generate_spread_sheet.py index 7d64f39bc..438ce1f10 100644 --- a/tools/compare_cts_reports/generate_spread_sheet.py +++ b/tools/compare_cts_reports/generate_spread_sheet.py @@ -27,6 +27,7 @@ python3 generate_spread_sheet.py \ """ import argparse +import constant import csv import gspread import os @@ -183,7 +184,9 @@ def _write_compare_details( # Module changes, need a new header row. if module_name != curr_module: - rows_content.append([f'{module_name} [{abi}]', ''] + [''] * num_reports) + module_with_abi = (module_name if abi == constant.ABI_IGNORED + else f'{module_name} [{abi}]') + rows_content.append([module_with_abi, ''] + [''] * num_reports) module_header_row = len(rows_content) header_cell = _get_range_cell( begin_row=curr_row, begin_column='A', diff --git a/tools/compare_cts_reports/parse_cts_report.py b/tools/compare_cts_reports/parse_cts_report.py index d045c21d7..8ed7111e3 100755 --- a/tools/compare_cts_reports/parse_cts_report.py +++ b/tools/compare_cts_reports/parse_cts_report.py @@ -134,7 +134,7 @@ class CtsReport: for module in root.iter('Module'): module_name = module.attrib['name'] - abi = 'ignored' if ignore_abi else module.attrib['abi'] + abi = constant.ABI_IGNORED if ignore_abi else module.attrib['abi'] for testcase in module.iter('TestCase'): class_name = testcase.attrib['name']