From 6d3d3b5fca7e93cfba340f83cfbadca656839634 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 20 Oct 2020 04:33:27 +0100 Subject: [PATCH] fix coverage workflow --- .github/workflows/coverage.yaml | 2 +- coverage.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index ff45c6072e..0b84aba18d 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -10,4 +10,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: ./coverage.py --fail-matched-undeleted --fail-unincluded + - run: ./coverage.py --fail-matched-undeleted --fail-unincluded --skip-sizes diff --git a/coverage.py b/coverage.py index d8422f62fb..e929036791 100755 --- a/coverage.py +++ b/coverage.py @@ -80,17 +80,19 @@ if __name__ == "__main__": print("--fail-unincluded exit with error code 2 if unincluded assembly files exist") print("--delete-matched delete matched function(s) from asm/nonmatchings/ without asking") print("--delete-unincluded delete unincluded, unmatched assembly files") + print("--skip-sizes don't attempt to read build/papermario.map to determine sizes") exit() total = len(matched) + len(non_matched) print(f"{len(matched)}+{len(partial_matched)} / {total} functions ({(len(matched) / total) * 100:.2f}%)") - function_sizes = parse_map_file() - size_matched = sum(function_sizes.get(f, 0) for f in matched) - size_partial_matched = sum(function_sizes.get(f, 0) for f in partial_matched) - size_non_matched = sum(function_sizes.get(f, 0) for f in non_matched) - size_total = size_matched + size_non_matched - print(f"{size_matched}+{size_partial_matched} / {size_total} bytes ({(size_matched / size_total) * 100:.2f}%)") + if not "--skip-sizes": + function_sizes = parse_map_file() + size_matched = sum(function_sizes.get(f, 0) for f in matched) + size_partial_matched = sum(function_sizes.get(f, 0) for f in partial_matched) + size_non_matched = sum(function_sizes.get(f, 0) for f in non_matched) + size_total = size_matched + size_non_matched + print(f"{size_matched}+{size_partial_matched} / {size_total} bytes ({(size_matched / size_total) * 100:.2f}%)") if len(matched_but_undeleted_asm) > 0: print(f"The following functions have been matched but still exist in asm/nonmatchings/: {' '.join(matched_but_undeleted_asm)}")