Skip to content

Commit d3739ff

Browse files
committed
test: Add lcov coverage report as well
1 parent 58dcd1c commit d3739ff

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

test/httpd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG HTTPD_EXTRA_FLAGS=""
66

77
FROM fedora:40
88

9-
RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf gcovr -y
9+
RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf gcovr lcov -y
1010

1111
ARG HTTPD_SOURCES
1212
ARG CFLAGS

test/includes/common.sh

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ run_test() {
4343
# docker has problems with names containing spaces
4444
f=$(echo ${2:-1} | sed 's/ /-/g')
4545
docker exec ${httpd_cont} sh -c "cd /native; gcovr --gcov-ignore-errors=no_working_dir_found --json /coverage/coverage-$f.json > /coverage/coverage-$f.log 2>&1"
46+
docker exec ${httpd_cont} sh -c "cd /native; lcov --capture --directory . --output-file /coverage/coverage-$f.info"
4647

4748
for f in $(docker exec ${httpd_cont} ls /coverage/); do
4849
docker cp ${httpd_cont}:/coverage/$f $PWD/coverage/$f > /dev/null

test/testsuite.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,12 @@ if [ $CODE_COVERAGE ]; then
130130
httpd_start > /dev/null 2>&1
131131
docker exec $MPC_NAME /usr/local/apache2/bin/apachectl stop
132132

133-
for f in $(ls coverage/*.json); do
133+
for f in $(ls coverage/*.json coverage/*.info); do
134134
docker cp $f $MPC_NAME:/coverage/ > /dev/null
135135
done
136136

137137
docker exec $MPC_NAME sh -c 'cd /native; gcovr --add-tracefile "/coverage/coverage-*.json" --html-details /coverage/test-coverage.html > /coverage/test-coverage.log 2>&1'
138+
docker exec $MPC_NAME sh -c 'cd /coverage; mkdir lcov; genhtml *.info --output-directory lcov'
138139
docker cp $MPC_NAME:/coverage/ . > /dev/null
139140

140141
httpd_remove

0 commit comments

Comments
 (0)