diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 23:36:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 23:36:42 +0000 |
| commit | 992cdee7c4994161d5768f0265b2c00f17dfbb2d (patch) | |
| tree | 4b9022b444e085576fbdd022008a90313124ead8 | |
| parent | e08ef944c3e54dd1a73608cd75bf24de42c50b5e (diff) | |
| parent | 34c1f9234d195abbe1b88122456e3112d1fe7067 (diff) | |
| download | development-992cdee7c4994161d5768f0265b2c00f17dfbb2d.tar.gz | |
Merge "compare_cts_reports: do not show ignored ABI in the sheet" into main am: b9bd79b5e3 am: 6a59d7737f am: 34c1f9234d
Original change: https://android-review.googlesource.com/c/platform/development/+/2867874
Change-Id: I8653499f4ea29f4d51c58cb878680ab1228072e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | tools/compare_cts_reports/constant.py | 2 | ||||
| -rw-r--r-- | tools/compare_cts_reports/generate_spread_sheet.py | 5 | ||||
| -rwxr-xr-x | 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'] |