From e981fc4f4d1579435d71588e169b3e498c83089e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 26 Sep 2025 14:47:58 -0400 Subject: [PATCH] gitlab-ci: add a job to test with Valgrind on Linux with Ninja --- .gitlab-ci.yml | 13 +++ .gitlab/ci/.gitattributes | 2 + .../configure_fedora42_ninja_valgrind.cmake | 6 ++ .gitlab/ci/configure_fedora42_valgrind.cmake | 2 + .gitlab/ci/ctest_exclusions.cmake | 14 +++ .../ci/ctest_memcheck_fedora42.valgrind.supp | 91 +++++++++++++++++++ .gitlab/ci/env_fedora42_ninja_valgrind.sh | 1 + .gitlab/os-linux.yml | 25 +++++ 8 files changed, 154 insertions(+) create mode 100644 .gitlab/ci/.gitattributes create mode 100644 .gitlab/ci/configure_fedora42_ninja_valgrind.cmake create mode 100644 .gitlab/ci/configure_fedora42_valgrind.cmake create mode 100644 .gitlab/ci/ctest_memcheck_fedora42.valgrind.supp create mode 100644 .gitlab/ci/env_fedora42_ninja_valgrind.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2d6c13ab2..df4423b5fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1030,6 +1030,19 @@ t:fedora42-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" +t:fedora42-ninja-valgrind: + extends: + - .fedora42_ninja_valgrind + - .cmake_test_linux_release + # Use a fast CPU so that timeouts are less of a concern. + - .linux_x86_64_tags_fast_x11 + - .cmake_valgrind_artifacts + - .run_dependent + - .needs_centos7_x86_64 + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + timeout: 2 hours + # macOS builds b:macos-x86_64-ninja: diff --git a/.gitlab/ci/.gitattributes b/.gitlab/ci/.gitattributes new file mode 100644 index 0000000000..b4f5f9da67 --- /dev/null +++ b/.gitlab/ci/.gitattributes @@ -0,0 +1,2 @@ +# Do not apply a size limit to suppression files. +*.valgrind.supp -hooks-max-size diff --git a/.gitlab/ci/configure_fedora42_ninja_valgrind.cmake b/.gitlab/ci/configure_fedora42_ninja_valgrind.cmake new file mode 100644 index 0000000000..c50e5df4cd --- /dev/null +++ b/.gitlab/ci/configure_fedora42_ninja_valgrind.cmake @@ -0,0 +1,6 @@ +set(CMake_TEST_Qt5 ON CACHE BOOL "") +set(CMake_TEST_Qt6 ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_valgrind.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_ninja.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora42_valgrind.cmake b/.gitlab/ci/configure_fedora42_valgrind.cmake new file mode 100644 index 0000000000..01753950bd --- /dev/null +++ b/.gitlab/ci/configure_fedora42_valgrind.cmake @@ -0,0 +1,2 @@ +# Disable bootstrap testing for Valgrind testing. +set(CMAKE_SKIP_BOOTSTRAP_TEST OFF CACHE BOOL "") diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index 89a5ace956..30f796b3e9 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -27,6 +27,20 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_jom") ) endif() +if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_valgrind") + list(APPEND test_exclusions + # Tests that timeout under valgrind. + "^RunCMake.NinjaMultiConfig$" + "^RunCMake.Autogen_Qt6_1$" + "^RunCMake.GoogleTest$" + "^RunCMake.CXXModules$" + "^RunCMake.CommandLine$" + + # Too spurious under Valgrind. + "^RunCMake.testUVProcessChain$" + ) +endif() + string(REPLACE ";" "|" test_exclusions "${test_exclusions}") if (test_exclusions) set(test_exclusions "(${test_exclusions})") diff --git a/.gitlab/ci/ctest_memcheck_fedora42.valgrind.supp b/.gitlab/ci/ctest_memcheck_fedora42.valgrind.supp new file mode 100644 index 0000000000..acc1d2ceae --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_fedora42.valgrind.supp @@ -0,0 +1,91 @@ +# Add Valgrind suppressions here. +{ + libc_start_main-malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + fun:__libc_start_main@@GLIBC_2.34 + ... +} +{ + dl_init-malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + fun:_dl_init + ... +} +{ + dl_init-calloc + Memcheck:Leak + match-leak-kinds: reachable + fun:calloc + ... + fun:_dl_init + ... +} +{ + dl_init-realloc + Memcheck:Leak + match-leak-kinds: reachable + fun:realloc + ... + fun:_dl_init + ... +} +{ + dl_open-malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + fun:_dl_open + ... +} +{ + dl_open-calloc + Memcheck:Leak + match-leak-kinds: reachable + fun:calloc + ... + fun:_dl_open + ... +} +{ + qt5-object-new + Memcheck:Leak + match-leak-kinds: reachable + fun:_Znwm + ... + fun:_ZN7QObjectC1ER14QObjectPrivatePS_ + ... +} +{ + qt5-logger-malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + fun:_ZNK14QMessageLogger5debugEv + ... +} +{ + strerror_l-malloc + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + fun:__vasprintf_internal + fun:__asprintf_chk + fun:strerror_l + ... +} +{ + bash + Memcheck:Leak + match-leak-kinds: reachable + ... + obj:/usr/bin/bash + ... +} diff --git a/.gitlab/ci/env_fedora42_ninja_valgrind.sh b/.gitlab/ci/env_fedora42_ninja_valgrind.sh new file mode 100644 index 0000000000..7ddc9e8ecc --- /dev/null +++ b/.gitlab/ci/env_fedora42_ninja_valgrind.sh @@ -0,0 +1 @@ +source .gitlab/ci/env_fedora42_ninja.sh diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 42daea4ec1..e552ea4c6b 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -337,6 +337,15 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" +.fedora_valgrind_addon: + extends: .fedora_memcheck + + variables: + CTEST_MEMORYCHECK_TYPE: Valgrind + CMAKE_CI_RUN_MEMCHECK: "true" + CMAKE_CI_TEST_TIMEOUT: "1500" + CMAKE_VALGRIND_CONFIGURATION: fedora42 + .fedora42_asan: extends: - .fedora42 @@ -345,6 +354,15 @@ variables: CMAKE_CONFIGURATION: fedora42_asan + +.fedora42_ninja_valgrind: + extends: + - .fedora42 + - .fedora_valgrind_addon + + variables: + CMAKE_CONFIGURATION: fedora42_ninja_valgrind + ### Intel Compiler .intelcompiler: @@ -616,6 +634,13 @@ - linux-x86_64 - x11 +.linux_x86_64_tags_fast_x11: + tags: + - cmake + - docker + - linux-x86_64-v4 + - x11 + .linux_x86_64_tags_cuda_arch_30: tags: - cmake