From 1cd6be01c2586a2d567937c03a25ec23d1cda3c0 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Thu, 7 Sep 2023 14:16:45 -0400 Subject: [PATCH] ci: fix ctest_memcheck args --- .gitlab/ci/ctest_memcheck.cmake | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/ctest_memcheck.cmake b/.gitlab/ci/ctest_memcheck.cmake index f30f4346e..8af8d8c23 100644 --- a/.gitlab/ci/ctest_memcheck.cmake +++ b/.gitlab/ci/ctest_memcheck.cmake @@ -37,20 +37,32 @@ set(test_exclusions $ENV{CTEST_EXCLUSIONS} ) +string(REPLACE " " ";" test_exclusions "${test_exclusions}") string(REPLACE ";" "|" test_exclusions "${test_exclusions}") if (test_exclusions) - set(test_exclusions "(${test_exclusions})") + set(test_exclusions EXCLUDE "(${test_exclusions})") endif () +if (DEFINED ENV{TEST_INCLUSIONS}) + set(test_inclusions INCLUDE $ENV{TEST_INCLUSIONS}) + unset(test_exclusions) +endif() + +set(PARALLEL_LEVEL "10") +if (DEFINED ENV{CTEST_MAX_PARALLELISM}) + set(PARALLEL_LEVEL $ENV{CTEST_MAX_PARALLELISM}) +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" + PARALLEL_LEVEL ${PARALLEL_LEVEL} RETURN_VALUE test_result - EXCLUDE "${test_exclusions}" + ${test_exclusions} + ${test_inclusions} DEFECT_COUNT defects ${junit_args} )