[#491] Add test coverage reports into the runtime documentation

mikir · mikir · commit dbd7109499a8 · 2023-03-23T16:09:11.000+01:00
diff --git a/cmake/coverage_utils.cmake b/cmake/coverage_utils.cmake
@@ -28,6 +28,7 @@ function(create_coverage_target)
     endif ()
 
     set(cov_binary_dir "${PROJECT_BINARY_DIR}/${cov_tgt_name}")
+    set(cov_install_dir "${CMAKE_INSTALL_PREFIX}/cpp/zserio_doc/coverage")
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         set(cov_fail)
@@ -49,7 +50,8 @@ function(create_coverage_target)
                 -r ${PROJECT_SOURCE_DIR}
                 --object-directory=${PROJECT_BINARY_DIR}
                 ${cov_fail}
-                ${cov_exclude}
+                ${cov_exclude} > ${cov_binary_dir}/coverage_report.txt
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${cov_binary_dir} ${cov_install_dir}/gcc
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
             VERBATIM
             COMMENT "Generating html code coverage report in ${cov_binary_dir}/index.html")
@@ -72,11 +74,15 @@ function(create_coverage_target)
             COMMAND ${LLVM_COV_BIN} report ${cov_test_exectable}
                 -instr-profile=${cov_binary_dir}/runtime.profdata
                 ${cov_exclude}
+            COMMAND bash -c "${LLVM_COV_BIN} report ${cov_test_exectable} \
+                    -instr-profile=${cov_binary_dir}/runtime.profdata ${cov_exclude} \
+                    > ${cov_binary_dir}/coverage_report.txt"
             COMMAND bash -c "(( \
                 `${LLVM_COV_BIN} report ${cov_test_exectable} \
                     -instr-profile=${cov_binary_dir}/runtime.profdata ${cov_exclude} | grep TOTAL | \
                     tr -s ' ' | cut -d' ' -f 10 | cut -d. -f 1` >= ${cov_INCOMPLETE_COVERAGE_FAIL} \
                 ))"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${cov_binary_dir} ${cov_install_dir}/clang
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
             VERBATIM
             COMMENT "Generating html code coverage report in ${cov_binary_dir}/index.html")
diff --git a/compiler/extensions/java/runtime/build.xml b/compiler/extensions/java/runtime/build.xml
@@ -54,6 +54,8 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
             value="${zserio_java_runtime.test.build_dir}/coverage"/>
     <property name="zserio_java_runtime.test.coverage_file"
             value="${zserio_java_runtime.test.coverage_dir}/jacoco_coverage.bin"/>
+    <property name="zserio_java_runtime.test.coverage_jar_file"
+            value="${zserio_java_runtime.install_dir}/zserio_runtime_coverage.jar"/>
 
     <property name="zserio_java_runtime.jar_dir" value="${zserio_java_runtime.build_dir}/jar"/>
     <property name="zserio_java_runtime.jar_file" value="${zserio_java_runtime.jar_dir}/zserio_runtime.jar"/>
@@ -311,13 +313,23 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
             </structure>
 
             <html destdir="${zserio_java_runtime.test.coverage_dir}"/>
+            <xml destfile="${zserio_java_runtime.test.coverage_dir}/jacoco_report.xml"/>
 
             <check>
                 <rule element="BUNDLE">
                     <limit counter="INSTRUCTION" value="COVEREDRATIO" minimum="92%"/>
                 </rule>
             </check>
         </jacoco:report>
+
+        <jar destfile="${zserio_java_runtime.test.coverage_jar_file}">
+            <fileset dir="${zserio_java_runtime.test.coverage_dir}">
+                <include name="**"/>
+            </fileset>
+            <manifest>
+                <attribute name="Implementation-Version" value="${zserio_java_runtime.version}"/>
+            </manifest>
+        </jar>
     </target>
 
     <target name="test" depends="test.run">
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -38,6 +38,7 @@ test_python_runtime()
     ZSERIO_CPP_DIR=$(ls -d1 "${BUILD_DIR}/zserio_cpp/lib"*)
     if [ $? -ne 0 ] ; then
         stderr_echo "Failed to locate C++ runtime binding to Python!"
+        popd > /dev/null
         return 1
     fi
 
@@ -66,6 +67,14 @@ test_python_runtime()
         return 1
     fi
 
+    python -m coverage xml -o "coverage/coverage_report.xml" --fail-under=100 --omit="*test_object*"
+    local COVERAGE_RESULT=$?
+    if [ ${COVERAGE_RESULT} -ne 0 ] ; then
+        stderr_echo "Running python coverage report failed with return code ${COVERAGE_RESULT}!"
+        popd > /dev/null
+        return 1
+    fi
+
     popd > /dev/null
     echo
 
@@ -176,6 +185,14 @@ install_python_runtime()
         return 1
     fi
 
+    # install test coverage report
+    echo "Installing test coverage report"
+    cp -r "${PYTHON_RUNTIME_BUILD_DIR}/coverage" "${PYTHON_RUNTIME_DISTR_DIR}/zserio_doc/coverage"
+    if [ $? -ne 0 ] ; then
+        stderr_echo "Failed to install documentation!"
+        return 1
+    fi
+
     return 0
 }
 
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -534,6 +534,12 @@ update_web_pages()
         stderr_echo "Cannot unzip zserio runtime javadocs jar!"
         return 1
     fi
+    "${UNZIP}" -q "${WEB_PAGES_BUILD_DIR}"/runtime_libs/java/zserio_runtime_coverage.jar \
+            -d "${WEB_PAGES_BUILD_DIR}"/runtime_libs/java/zserio_doc/coverage -x META-INF/* 
+    if [ $? -ne 0 ] ; then
+        stderr_echo "Cannot unzip zserio runtime javadocs jar!"
+        return 1
+    fi
     echo "Done"
 
     echo -ne "Copying Zserio runtime libraries..."
