From 8459ff022bc24af2fb24ca7936f26d31a9c01cba Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 26 Sep 2025 14:43:14 -0400 Subject: [PATCH] ci: factor out memcheck "prep" logic This is to support running memcheck as part of the "standalone" workflow. --- .gitlab/ci/ctest_memcheck.cmake | 8 +------- .gitlab/ci/ctest_memcheck_prep.cmake | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 .gitlab/ci/ctest_memcheck_prep.cmake diff --git a/.gitlab/ci/ctest_memcheck.cmake b/.gitlab/ci/ctest_memcheck.cmake index 3e3a411cdf..ee5296d57a 100644 --- a/.gitlab/ci/ctest_memcheck.cmake +++ b/.gitlab/ci/ctest_memcheck.cmake @@ -20,13 +20,7 @@ if (NOT "$ENV{CMAKE_CI_TEST_TIMEOUT}" STREQUAL "") set(CTEST_TEST_TIMEOUT "$ENV{CMAKE_CI_TEST_TIMEOUT}") endif () -set(CTEST_MEMORYCHECK_TYPE "$ENV{CTEST_MEMORYCHECK_TYPE}") -set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS "$ENV{CTEST_MEMORYCHECK_SANITIZER_OPTIONS}") - -set(lsan_suppressions "${CMAKE_CURRENT_LIST_DIR}/ctest_memcheck_$ENV{CMAKE_CONFIGURATION}.lsan.supp") -if (EXISTS "${lsan_suppressions}") - set(ENV{LSAN_OPTIONS} "suppressions='${lsan_suppressions}'") -endif () +include("${CMAKE_CURRENT_LIST_DIR}/ctest_memcheck_prep.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ctest_exclusions.cmake") ctest_memcheck( diff --git a/.gitlab/ci/ctest_memcheck_prep.cmake b/.gitlab/ci/ctest_memcheck_prep.cmake new file mode 100644 index 0000000000..e537d51840 --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_prep.cmake @@ -0,0 +1,7 @@ +set(CTEST_MEMORYCHECK_TYPE "$ENV{CTEST_MEMORYCHECK_TYPE}") +set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS "$ENV{CTEST_MEMORYCHECK_SANITIZER_OPTIONS}") + +set(lsan_suppressions "${CMAKE_CURRENT_LIST_DIR}/ctest_memcheck_$ENV{CMAKE_CONFIGURATION}.lsan.supp") +if (EXISTS "${lsan_suppressions}") + set(ENV{LSAN_OPTIONS} "suppressions='${lsan_suppressions}'") +endif ()