diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-09-20 17:33:52 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-27 21:37:34 +0000 |
| commit | 0c596a170a880579cef9c5beacaa1679a23c5cf2 (patch) | |
| tree | bca93d3be75d65eda33044716cb3e672abec525c | |
| parent | c3fb51caf35a068e4030fc95ec65c20de7c789ce (diff) | |
| download | chrome-ec-0c596a170a880579cef9c5beacaa1679a23c5cf2.tar.gz | |
gitlab: Also build cros-ec coverage report
Build both the zephyr and the cros-ec coverage reports, and merge the
info files.
BRANCH=None
BUG=None
TEST=Ran cmds in docker.
Change-Id: I22e8c1e6192ba4b917fc5a5ee434dfb4edcb866d
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3173096
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c01edb7c1a..b857ef64fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -image: jbettis/bionic-20200807-27aug21 +image: jbettis/bionic-20200807-20sep21 # You can update that image using this repo: # https://gitlab.com/zephyr-ec/gitlab-ci-runner/-/tree/main @@ -35,6 +35,7 @@ before_script: - git clone -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis "${MODULES_DIR}/cmsis" - git clone -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/hal_stm32 "${MODULES_DIR}/hal_stm32" - git clone -b main https://chromium.googlesource.com/chromiumos/third_party/zephyr/nanopb "${MODULES_DIR}/nanopb" + - git clone -b main https://chromium.googlesource.com/chromiumos/third_party/cryptoc "${MODULES_DIR}/cryptoc" - ln -s "$(pwd)" "${MODULES_DIR}/ec" - python3 -V # Print out python version for debugging - python3 -m pip install zephyr/zmake --user @@ -128,11 +129,17 @@ coverage: script: - zmake --zephyr-base "${ZEPHYR_BASE}26" --modules-dir "${MODULES_DIR}" -l DEBUG coverage - "${BUILD_DIR}/coverage" - - ls "${BUILD_DIR}/coverage" "${BUILD_DIR}/coverage/coverage_rpt" + "${BUILD_DIR}/zcoverage" + - make -j CRYPTOC_DIR="${MODULES_DIR}/cryptoc" + FTDIVERSION=1 HOSTGCOV='gcov' + CROSS_COMPILE_arm=/opt/zephyr-sdk/arm-zephyr-eabi/bin/arm-zephyr-eabi- + coverage + - lcov -o build/merged.info -a build/coverage/lcov.info -a build/zcoverage/lcov.info artifacts: paths: - - build/coverage/* + - build/zcoverage/coverage_rpt/* + - build/coverage/coverage_rpt/* + - build/merged.info expire_in: 1 week testall: |