test: Add lcov coverage report as well

Author: jajik

test/httpd/Dockerfile

@@ -6,7 +6,7 @@ ARG HTTPD_EXTRA_FLAGS=""
 
 FROM fedora:40
 
-RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf gcovr -y
+RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf gcovr lcov -y
 
 ARG HTTPD_SOURCES
 ARG CFLAGS

test/includes/common.sh

@@ -43,6 +43,7 @@ run_test() {
         # docker has problems with names containing spaces
         f=$(echo ${2:-1} | sed 's/ /-/g')
         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"
+        docker exec ${httpd_cont} sh -c "cd /native; lcov --capture --directory . --output-file /coverage/coverage-$f.info"
 
         for f in $(docker exec ${httpd_cont} ls /coverage/); do
             docker cp ${httpd_cont}:/coverage/$f $PWD/coverage/$f > /dev/null

test/testsuite.sh

@@ -130,11 +130,12 @@ if [ $CODE_COVERAGE ]; then
     httpd_start > /dev/null 2>&1
     docker exec $MPC_NAME /usr/local/apache2/bin/apachectl stop
 
-    for f in $(ls coverage/*.json); do
+    for f in $(ls coverage/*.json coverage/*.info); do
         docker cp $f $MPC_NAME:/coverage/ > /dev/null
     done
 
     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'
+    docker exec $MPC_NAME sh -c 'cd /coverage; mkdir lcov; genhtml *.info --output-directory lcov'
     docker cp $MPC_NAME:/coverage/ .  > /dev/null
 
     httpd_remove