Merge topic 'add-junit-test'

5e845e6db CI: fix junit upload cmake ver requirement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2786
This commit is contained in:
Vicente Bolea 2022-06-15 22:11:03 +00:00 committed by Kitware Robot
commit b170887d3b
2 changed files with 6 additions and 6 deletions

@ -206,9 +206,9 @@ stages:
- build/*.png
- build/*.pnm
- build/*.pmm
- build/unit_test_junit_stats.xml
reports:
junit:
- build/junit.xml
junit: build/unit_test_junit_stats.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
reports:
junit:
- build/junit.xml
junit: build/unit_test_junit_stats.xml
include:

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