From c4c86a69c6865e65a90050be173c962da5a916e7 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Sun, 4 Feb 2024 18:08:58 -0800 Subject: [PATCH] Jenkins fix attempts --- CMakeLists.txt | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34045b1..3c4d221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ if(BUILD_TESTING) ON) add_test(NAME conflict_set_cxx_api_test COMMAND conflict_set_cxx_api_test) - if(NOT APPLE) + if(NOT APPLE AND NOT CMAKE_BUILD_TYPE STREQUAL Debug) add_test( NAME conflict_set_shared_symbols COMMAND ${CMAKE_SOURCE_DIR}/test_symbols.sh diff --git a/Jenkinsfile b/Jenkinsfile index 2010cab..bf715e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,7 +61,7 @@ pipeline { } } steps { - CleanBuildAndTest("-DCMAKE_C{,XX}_FLAGS=--coverage -DCMAKE_BUILD_TYPE=Debug") + CleanBuildAndTest("-DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DCMAKE_BUILD_TYPE=Debug") sh ''' gcovr --gcov-executable "llvm-cov-15 gcov" --exclude '.*third_party.*' --cobertura > build/coverage.xml '''