From fa7c8a914fb9a528f9abe6eb6a5f3e8682080b62 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 17 Jul 2020 17:02:37 +0200 Subject: [PATCH] Merge #19538: ci: Add tsan suppression for race in DatabaseBatch 0cdf2a77ddfa1d53c6fbd830d557a3f20d7fc365 ci: add tsan debug symbols option (Russell Yanofsky) 9a2f12680b3f00a207f1cdd4e0c50a3c7613aefc ci: Add tsan suppression for race in DatabaseBatch (Hennadii Stepanov) Pull request description: Since #19325 was merged, the corresponding change in TSan suppression file gets required. This PR is: - an analogous to #19226 and #19450, and - a temporary workaround for CI fail like https://cirrus-ci.com/task/5741795508224000?command=ci#L4993 ACKs for top commit: MarcoFalke: ACK 0cdf2a77ddfa1d53c6fbd830d557a3f20d7fc365 Tree-SHA512: 7832f143887c8a0df99dea03e00694621710378fbe923e3592185fcd3658546a590693b513abffc5ab96e9ef76c9c4bff3330eeee69a0c5dbe7574f34c417220 --- ci/test/00_setup_env_native_tsan.sh | 2 +- test/sanitizer_suppressions/tsan | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 60b2eaab6b791d..e1968ce26c62dc 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -12,7 +12,7 @@ export DEP_OPTS="NO_UPNP=1 DEBUG=1" export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163) export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --enable-suppress-external-warnings --with-sanitizers=thread" -export BITCOIN_CONFIG="${BITCOIN_CONFIG} CC=clang-15 CXX=clang++-15 CXXFLAGS=-Werror=thread-safety" +export BITCOIN_CONFIG="${BITCOIN_CONFIG} CC=clang-15 CXX=clang++-15 CXXFLAGS='-Werror=thread-safety -g'" export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG" export PYZMQ=true export RUN_SYMBOL_TESTS=false diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index 73982b87f59573..d1f5d328b9cfc0 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -3,6 +3,9 @@ # # https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions +# Data races from DatabaseBatch +race:DatabaseBatch + # Data races from zmq namespace race:zmq::*