From 452bf8d7c428ecf45df5fbe3ace386cdd9ce1bb6 Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Fri, 10 Dec 2021 14:00:06 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3330724 Tested-by: Jeremy Bettis Auto-Submit: Jeremy Bettis Reviewed-by: Yuval Peress Commit-Queue: Yuval Peress --- .gitlab-ci.yml | 8 ++++---- 1 file 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: -- cgit v1.2.1