WIP vol. X

Author: jajik

native/CMakeLists.txt

@@ -17,6 +17,8 @@ ELSE()
     SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -p -std=gnu99 -fPIC -Wall -Wextra --coverage -fprofile-arcs -ftest-coverage -fPIC -O0 -lgcov")
 ENDIF()
 
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
+
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/modules)
 SET(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})

native/balancers/CMakeLists.txt

@@ -21,7 +21,7 @@ ADD_LIBRARY(mod_lbmethod_cluster MODULE ${MOD_PROXY_CLUSTER_SRCS})
 SET_TARGET_PROPERTIES(mod_lbmethod_cluster PROPERTIES PREFIX "")
 SET_TARGET_PROPERTIES(mod_lbmethod_cluster PROPERTIES SUFFIX ".so")
 IF(WIN32)
-    TARGET_LINK_LIBRARIES(mod_lbmethod_cluster mod_proxy_cluster_common ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_lbmethod_cluster $<TARGET_OBJECTS:mod_proxy_cluster_common> ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ELSE()
-    TARGET_LINK_LIBRARIES(mod_lbmethod_cluster mod_proxy_cluster_common ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_lbmethod_cluster $<TARGET_OBJECTS:mod_proxy_cluster_common> ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ENDIF()

native/mod_manager/CMakeLists.txt

@@ -29,7 +29,7 @@ SET_TARGET_PROPERTIES(mod_manager PROPERTIES PREFIX "")
 SET_TARGET_PROPERTIES(mod_manager PROPERTIES SUFFIX ".so")
 
 IF(WIN32)
-    TARGET_LINK_LIBRARIES(mod_manager mod_proxy_cluster_common ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_manager $<TARGET_OBJECTS:mod_proxy_cluster_common> ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ELSE()
-    TARGET_LINK_LIBRARIES(mod_manager mod_proxy_cluster_common ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_manager $<TARGET_OBJECTS:mod_proxy_cluster_common> ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ENDIF()

native/mod_proxy_cluster/CMakeLists.txt

@@ -21,7 +21,7 @@ ADD_LIBRARY(mod_proxy_cluster MODULE ${MOD_PROXY_CLUSTER_SRCS})
 SET_TARGET_PROPERTIES(mod_proxy_cluster PROPERTIES PREFIX "")
 SET_TARGET_PROPERTIES(mod_proxy_cluster PROPERTIES SUFFIX ".so")
 IF(WIN32)
-    TARGET_LINK_LIBRARIES(mod_proxy_cluster mod_proxy_cluster_common ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_proxy_cluster $<TARGET_OBJECTS:mod_proxy_cluster_common> ${PROXY_LIBRARY} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ELSE()
-    TARGET_LINK_LIBRARIES(mod_proxy_cluster mod_proxy_cluster_common ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
+    TARGET_LINK_LIBRARIES(mod_proxy_cluster $<TARGET_OBJECTS:mod_proxy_cluster_common> ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} ${APACHE_LIBRARY})
 ENDIF()

test/httpd/Containerfile

@@ -43,6 +43,8 @@ RUN rm -rf /test/httpd/mod_proxy_cluster
 FROM fedora:42
 
 ENV CONF=httpd/mod_proxy_cluster.conf
+ENV GCOV_PREFIX=/coverage
+ENV GCOV_PREFIX_STRIP=3 
 
 RUN dnf install pcre apr-util wcstools gcovr lcov -y
 

test/includes/common.sh

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