ci: memcheck generates junit reports

.gitlab-ci.yml

@@ -206,9 +206,9 @@ stages:
       - build/*.png
       - build/*.pnm
       - build/*.pmm
-      - build/unit_test_junit_stats.xml
+      - build/junit.xml
     reports:
-      junit: build/unit_test_junit_stats.xml
+      junit: build/junit.xml
 
 .cmake_build_artifacts: &cmake_build_artifacts
   artifacts:
@@ -240,9 +240,9 @@ stages:
       - build/**/*.png
       - build/**/*.pnm
       - build/**/*.pmm
-      - build/unit_test_junit_stats.xml
+      - build/junit.xml
     reports:
-      junit: build/unit_test_junit_stats.xml
+      junit: build/junit.xml
 
 
 include:

.gitlab/ci/ctest_memcheck.cmake

@@ -42,12 +42,18 @@ if (test_exclusions)
   set(test_exclusions "(${test_exclusions})")
 endif ()
 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
+  set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/junit.xml")
+endif()
+
 # reduced parallel level so we don't exhaust system resources
 ctest_memcheck(
   PARALLEL_LEVEL "4"
   RETURN_VALUE test_result
   EXCLUDE "${test_exclusions}"
-  DEFECT_COUNT defects)
+  DEFECT_COUNT defects
+  ${junit_args}
+  )
 
 ctest_submit(PARTS Memcheck BUILD_ID build_id)
   message(STATUS "Memcheck submission build_id: ${build_id}")

.gitlab/ci/ctest_test.cmake

@@ -33,7 +33,7 @@ if (test_exclusions)
 endif ()
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
-  set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/unit_test_junit_stats.xml")
+  set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/junit.xml")
 endif()
 
 set(PARALLEL_LEVEL "10")