diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-01-18 16:06:58 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-19 19:35:08 +0000 |
| commit | ce92805dee3b8acea79163fccfd023231f2e13bc (patch) | |
| tree | cdcb0e88166163a0d01c69d6d2c747c9ba898940 | |
| parent | d61fb7173c64dd87e931ec9c9b83167cc29e7318 (diff) | |
| download | chrome-ec-ce92805dee3b8acea79163fccfd023231f2e13bc.tar.gz | |
gitlab: Generate html reports with branch coverage
Lcov was already being run with branch coverage, but include that in
the html reports also.
BRANCH=None
BUG=None
TEST=Ran commands locally
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ia64d120ec13ef7e741ba78bc6d05621f1b045215
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3399900
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | Makefile.rules | 2 | ||||
| -rw-r--r-- | zephyr/test/drivers/README.md | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 553dc74b83..0acbede5ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,8 @@ seed_cache: sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/filtered_twister.info" -e "${BUILD_DIR}/${PROJECT}/merged_twister_no_ec.info" - - /usr/bin/genhtml -q -o "${BUILD_DIR}/${PROJECT}/filtered_twister_rpt" + - /usr/bin/genhtml --branch-coverage -q + -o "${BUILD_DIR}/${PROJECT}/filtered_twister_rpt" -t "${PROJECT} coverage of twister tests" -s "${BUILD_DIR}/${PROJECT}/filtered_twister.info" - lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/merged.info" @@ -121,7 +122,8 @@ seed_cache: sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/filtered_no_zephyr.info" -e "${BUILD_DIR}/${PROJECT}/merged_no_zephyr.info" - - /usr/bin/genhtml -q -o "${BUILD_DIR}/${PROJECT}/filtered_no_zephyr_rpt" + - /usr/bin/genhtml --branch-coverage -q + -o "${BUILD_DIR}/${PROJECT}/filtered_no_zephyr_rpt" -t "${PROJECT} coverage w/o zephyr" -p ${EC_DIR} -s "${BUILD_DIR}/${PROJECT}/filtered_no_zephyr.info" diff --git a/Makefile.rules b/Makefile.rules index 1002bb6ff8..8f2d2994e5 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -417,7 +417,7 @@ cmd_lcov-initial=lcov --rc lcov_branch_coverage=1 --gcov-tool \ -i -t $* --exclude '*/ec/test/*' --exclude '*/ec/include/tests/*' cmd_merge_cov=lcov --rc lcov_branch_coverage=1 -o build/coverage/lcov.info \ $(foreach info,$^,-a ${info}) -cmd_report_cov=genhtml -q -o build/coverage/coverage_rpt -t \ +cmd_report_cov=genhtml --branch-coverage -q -o build/coverage/coverage_rpt -t \ "EC Unittest "$(bldversion) -s $^ cmd_strip_lcov=sed -i build/coverage/lcov.info \ -e 's/\/mnt\/host\/source\/src\/platform\/ec\///' diff --git a/zephyr/test/drivers/README.md b/zephyr/test/drivers/README.md index bab73cebd8..ab57e510cf 100644 --- a/zephyr/test/drivers/README.md +++ b/zephyr/test/drivers/README.md @@ -20,7 +20,8 @@ To calculate code coverage for this test only ```bash (chroot) zmake configure --coverage --test zephyr/test/drivers -(chroot) genhtml -q -o build/zephyr/test-drivers/output/coverage_rpt \ +(chroot) genhtml --branch-coverage -q \ + -o build/zephyr/test-drivers/output/coverage_rpt \ build/zephyr/test-drivers/output/zephyr.info ``` |