play with circle-ci machines see if that changes the sanitizer builds

LLNL · Dec 12, 2024 · 4ac0f41 · 4ac0f41
1 parent acb6b03
commit 4ac0f41
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,8 +38,10 @@ aliases:
 
 jobs:
   unitsTSan:
+    machine:
+      image: ubuntu-2204:2024.11.1
     docker:
-      - image: helics/buildenv:sanitizers-14
+      - image: helics/buildenv:sanitizers-19
     environment:
       CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -L/root/develop/libcxx_tsan/lib -lc++ -lc++abi -I/root/develop/libcxx_tsan/include -I/root/develop/libcxx_tsan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O2 -Wl,-rpath,/root/develop/libcxx_tsan/lib"  '
       TSAN_OPTIONS: "second_deadlock_stack=1"
@@ -49,8 +51,10 @@ jobs:
       - run: *run_units
 
   unitsASan:
+    machine:
+      image: ubuntu-2204:2024.11.1
     docker:
-      - image: helics/buildenv:sanitizers-14
+      - image: helics/buildenv:sanitizers-19
     environment:
       CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=undefined,address -lc++ -lc++abi -fsanitize-address-use-after-scope -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O1  -fsanitize-blacklist=/root/project/.circleci/asan_blacklist.txt"  '
       LSAN_OPTIONS: "suppressions=/root/project/.circleci/leak_suppression.txt"
@@ -62,8 +66,10 @@ jobs:
       - run: *run_units
 
   unitsMSan:
+    machine:
+      image: ubuntu-2204:2024.11.1
     docker:
-      - image: helics/buildenv:sanitizers-14
+      - image: helics/buildenv:sanitizers-19
     environment:
       CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=memory -nostdinc++ -nostdlib++ -L/root/develop/libcxx_msan/lib -lc++ -lc++abi -I/root/develop/libcxx_msan/include -I/root/develop/libcxx_msan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O1 -Wl,-rpath,/root/develop/libcxx_msan/lib" '
 

diff --git a/config/AddGoogletest.cmake b/config/AddGoogletest.cmake
@@ -41,9 +41,10 @@ add_subdirectory(
 )
 
 if(NOT MSVC)
-    # target_Compile_options(gtest PRIVATE "-Wno-undef") target_Compile_options(gmock
-    # PRIVATE "-Wno-undef") target_Compile_options(gtest_main PRIVATE "-Wno-undef")
-    # target_Compile_options(gmock_main PRIVATE "-Wno-undef")
+    target_compile_options(gtest PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
+    target_compile_options(gmock PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions") 
+    target_compile_options(gtest_main PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
+    target_compile_options(gmock_main PRIVATE "-Wno-undef -Wno-c++17-attribute-extensions")
 endif()
 
 if(GOOGLE_TEST_INDIVIDUAL)