From 99e64729bb42755f29af31fbbe631ad5d1df420e Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 11 May 2020 10:05:46 +0300 Subject: [PATCH] Remove obsolete TSan suppressions --- cmake/sanitize.cmake | 6 ++++-- tests/tsan_suppressions.txt | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake index e9fa0a01d4a..32443ed78c3 100644 --- a/cmake/sanitize.cmake +++ b/cmake/sanitize.cmake @@ -36,8 +36,10 @@ if (SANITIZE) endif () elseif (SANITIZE STREQUAL "thread") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=thread") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=thread") + set (TSAN_FLAGS "-fsanitize=thread -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/tsan_suppressions.txt") + + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread") endif() diff --git a/tests/tsan_suppressions.txt b/tests/tsan_suppressions.txt index 3dc306ee133..912e0361bff 100644 --- a/tests/tsan_suppressions.txt +++ b/tests/tsan_suppressions.txt @@ -1,5 +1 @@ -# libc++ -race:locale - -# Too many mutexes: https://github.com/google/sanitizers/issues/950 -deadlock:DB::MergeTreeReadPool::fillPerPartInfo +# Fortunately, we have no suppressions!