Jenkins fix attempts

2024-02-04 18:08:58 -08:00
parent 345af773fb
commit c4c86a69c6
2 changed files with 2 additions and 2 deletions
--- 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
--- a/2
+++ b/2
@@ -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
                '''