diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-02-25 16:50:13 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-28 18:24:54 +0000 |
| commit | 8feab3528995459ad8f0b098ced4188b18db5fe8 (patch) | |
| tree | e8095465952765e0fba63f81092940b01fa02a00 /.gitlab-ci.yml | |
| parent | 83a9fa4349daf1e709980b34716ad917178334a7 (diff) | |
| download | chrome-ec-8feab3528995459ad8f0b098ced4188b18db5fe8.tar.gz | |
zmake: Don't exclude anything from coverage
In zmake, don't remove any directories from the coverage reports.
In gitlab, add the exclusions back in so that we get the same finished
html report that we got before.
BRANCH=None
BUG=b:156895937
TEST=Ran firmware_builder.py, verified zephyr/test & zephyr/emul
Ran .gitlab-ci.yml commands for herobrine and verified that
build/herobrine/output/filtered_no_zephyr.info is unchanged.
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ie8fd1e787d8bb6e745f89d773113cccb6c335009
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3491416
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c2f045e32..064fc16ba2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,9 +115,11 @@ seed_cache: - lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/no_zephyr.info" -r "${BUILD_DIR}/${PROJECT}/output/zephyr.info" "${ZEPHYR_BASE}/**" "${MODULES_DIR}/*" "${EC_DIR}/zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*' + "${EC_DIR}/build/*/build-*/zephyr/*/generated/**" - lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/merged_no_zephyr.info" -r "${BUILD_DIR}/${PROJECT}/output/merged.info" "${ZEPHYR_BASE}/**" "${MODULES_DIR}/*" "${EC_DIR}/zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*' + "${EC_DIR}/build/*/build-*/zephyr/*/generated/**" - grep "SF:" "${BUILD_DIR}/${PROJECT}/output/no_zephyr.info" | sort -u | sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/filtered_no_zephyr.info" @@ -243,8 +245,11 @@ merged_coverage: "${ZEPHYR_BASE}/**" "${MODULES_DIR}/**" "${EC_DIR}/zephyr/drivers/**" "${EC_DIR}/zephyr/include/drivers/**" "${EC_DIR}/zephyr/shim/chip/**" "${EC_DIR}/zephyr/shim/core/**" - "${EC_DIR}/zephyr/projects/**" - '/usr/include/x86_64-linux-gnu/**' + "${EC_DIR}/zephyr/projects/**" "/usr/include/x86_64-linux-gnu/**" + "${EC_DIR}/build/*/build-*/zephyr/*/generated/**" "${EC_DIR}/test/**" + "${EC_DIR}/zephyr/shim/chip/npcx/npcx_monitor/**" + "${EC_DIR}/zephyr/emul/**" "${EC_DIR}/zephyr/test/**" + "**/testsuite/**" "**/subsys/emul/**" artifacts: paths: - build/*.info |