diff options
| author | Yuval Peress <peress@google.com> | 2021-11-19 11:24:37 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-30 17:56:53 +0000 |
| commit | 7971149e9f96f2742b6f56a699a3aa9b9ac2e9de (patch) | |
| tree | 66bc3eec9e565ecdd809bcb35b368cc94aac2de9 | |
| parent | daa5b96aaa6a9450d96e351265f691f9a70fb599 (diff) | |
| download | chrome-ec-7971149e9f96f2742b6f56a699a3aa9b9ac2e9de.tar.gz | |
zephyr: gitlab: Use glob pattery to filter zephyr/drivers
Looks like * in lcov isn't recusive. Use ** instead which does the
job correctly. Also, include the matching include/ directory which
I missed on the first pass.
BRANCH=none
BUG=none
TEST=Run tests with coverage, then manually run lcov and verify that
the directory was removed.
Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I7eb58b0eff01ecd5ba9c4f5da18e947d3e41c489
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3291127
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd77d308cd..703b5ad12b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -182,7 +182,10 @@ merged_coverage: needs: ["ec_coverage", "zephyr_coverage"] script: - lcov -o build/merged.info -a build/coverage/lcov.info -a build/zcoverage/lcov.info - - lcov -o build/merged_no_zephyr.info -r build/merged.info "${ZEPHYR_BASE}/*" "${MODULES_DIR}/*" "zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*' + - lcov -o build/merged_no_zephyr.info -r build/merged.info + "${ZEPHYR_BASE}/**" "${MODULES_DIR}/**" + 'zephyr/drivers/**' 'zephyr/include/drivers/**' + '/usr/include/x86_64-linux-gnu/**' artifacts: paths: - build/*.info |