summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2021-12-10 14:00:06 -0700
committerCommit Bot <commit-bot@chromium.org>2021-12-11 00:20:42 +0000
commit452bf8d7c428ecf45df5fbe3ace386cdd9ce1bb6 (patch)
tree6ff071ed7891ceb5505d3798c7d0c6263eda9f50
parent3be88c64f2cf3b8a7a815a7e7d14bcf3d5843d61 (diff)
downloadchrome-ec-452bf8d7c428ecf45df5fbe3ace386cdd9ce1bb6.tar.gz
gitlab: Specify absolute paths to lcov
lcov needs absolute paths, or */dir patterns. Change remove paths to be absolute. BRANCH=None BUG=None TEST=Ran commands by hand Change-Id: I4878fc429ff4dcd75684d51aa88971ed592c198f Signed-off-by: Jeremy Bettis <jbettis@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3330724 Tested-by: Jeremy Bettis <jbettis@chromium.org> Auto-Submit: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Yuval Peress <peress@google.com> Commit-Queue: Yuval Peress <peress@google.com>
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f8ecfa4ef..d25316c783 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,10 +104,10 @@ seed_cache:
-a "${BUILD_DIR}/${PROJECT}/lcov.info" -a build/merged.info
- lcov -o "${BUILD_DIR}/${PROJECT}/no_zephyr.info"
-r "${BUILD_DIR}/${PROJECT}/lcov.info" "${ZEPHYR_BASE}/**"
- "${MODULES_DIR}/*" "zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*'
+ "${MODULES_DIR}/*" "${EC_DIR}/zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*'
- lcov -o "${BUILD_DIR}/${PROJECT}/merged_no_zephyr.info"
-r "${BUILD_DIR}/${PROJECT}/merged.info" "${ZEPHYR_BASE}/**"
- "${MODULES_DIR}/*" "zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*'
+ "${MODULES_DIR}/*" "${EC_DIR}/zephyr/drivers/*" '/usr/include/x86_64-linux-gnu/*'
- grep "SF:" "${BUILD_DIR}/${PROJECT}/no_zephyr.info" | sort -u |
sed -e 's|^SF:||' | xargs lcov
-o "${BUILD_DIR}/${PROJECT}/filtered_no_zephyr.info"
@@ -205,8 +205,8 @@ merged_coverage:
- 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/**' 'zephyr/include/drivers/**'
- 'zephyr/shim/chip/**' 'zephyr/shim/core/**'
+ '${EC_DIR}/zephyr/drivers/**' '${EC_DIR}/zephyr/include/drivers/**'
+ '${EC_DIR}/zephyr/shim/chip/**' '${EC_DIR}/zephyr/shim/core/**'
'/usr/include/x86_64-linux-gnu/**'
artifacts:
paths: