From a13ed8771e1751ea6966e21b5c73078f1df8b02c Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Tue, 18 Oct 2022 11:43:41 -0600 Subject: cq: Remove unnecessary lcov command There is a lcov command that is merging 2 files that are already combined. Remove it, and change the dependent steps. BRANCH=None BUG=None TEST=Ran before and after and diffed the metrics Signed-off-by: Jeremy Bettis Change-Id: Ifb78cbec97983198baf00077c3bb945ec31f350f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3964534 Tested-by: Jeremy Bettis Reviewed-by: Abe Levkoy Auto-Submit: Jeremy Bettis Commit-Queue: Abe Levkoy Commit-Queue: Jeremy Bettis --- zephyr/firmware_builder.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/zephyr/firmware_builder.py b/zephyr/firmware_builder.py index 1cba339d5e..545d31312d 100755 --- a/zephyr/firmware_builder.py +++ b/zephyr/firmware_builder.py @@ -326,25 +326,6 @@ def test(opts): ).stdout _extract_lcov_summary("EC_ZEPHYR_MERGED", metrics, output) - cmd = [ - "/usr/bin/lcov", - "-o", - build_dir / "lcov_unfiltered.info", - "--rc", - "lcov_branch_coverage=1", - "-a", - build_dir / "zephyr_merged.info", - "-a", - platform_ec / "build/coverage/lcov.info", - ] - log_cmd(cmd) - subprocess.run( - cmd, - cwd=zephyr_dir, - check=True, - stdin=subprocess.DEVNULL, - ) - test_patterns = [ # Exclude tests platform_ec / "test/**", @@ -388,7 +369,7 @@ def test(opts): "--rc", "lcov_branch_coverage=1", "-r", - build_dir / "lcov_unfiltered.info", + build_dir / "zephyr_merged.info", ] + generated_and_system_patterns log_cmd(cmd) output = subprocess.run( -- cgit v1.2.1