From 6829ced2655cf339ff0fc1c3989e8faccbb01f95 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:30:10 -0600 Subject: [PATCH] Fix test --- .github/workflows/linux-other-builds.yml | 16 ++++++++++++++++ tests/ExtraTests/CMakeLists.txt | 6 ------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-other-builds.yml b/.github/workflows/linux-other-builds.yml index 6993c815..3ae36589 100644 --- a/.github/workflows/linux-other-builds.yml +++ b/.github/workflows/linux-other-builds.yml @@ -68,6 +68,22 @@ jobs: cmake_configurations: -DMEMORYCHECK_COMMAND=`which valgrind` -DMEMORYCHECK_COMMAND_OPTIONS="-q --track-origins=yes --leak-check=full --num-callers=50 --show-leak-kinds=definite --error-exitcode=1" other_ctest_args: -T memcheck -LE uses-python + # Thread sanitizer test gcc-7 + - cxx: g++-7 + build_description: Thread sanitizer tests + build_type: Debug + std: 14 + other_pkgs: g++-7 + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCMAKE_CXX_FLAGS="-fsanitize=thread" + + # Thread sanitizer test clang-10 + - cxx: clang++-10 + build_description: Thread sanitizer tests + build_type: Debug + std: 14 + other_pkgs: clang-10 + cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCMAKE_CXX_FLAGS="-fsanitize=thread" + steps: - uses: actions/checkout@v4 diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt index baf7b913..8b4a8058 100644 --- a/tests/ExtraTests/CMakeLists.txt +++ b/tests/ExtraTests/CMakeLists.txt @@ -491,12 +491,6 @@ set_tests_properties( PASS_REGULAR_EXPRESSION "passed" FAIL_REGULAR_EXPRESSION "ThreadSanitizer" ) -if (NOT WIN32) - target_compile_options( Reporters::Multithreading - PUBLIC - $<$,$,$>:-fsanitize=thread> - ) -endif() add_executable(AssertionStartingEventGoesBeforeAssertionIsEvaluated X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp