From fadbd9988590ba94e3fd2d87d773f3b09d73ef46 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 13 Apr 2021 19:54:37 +0200 Subject: [PATCH 1/2] test: Remove spurious double lock tsan suppressions by bumping to clang-12 --- .cirrus.yml | 4 ++-- ci/test/00_setup_env_native_tsan.sh | 2 +- test/sanitizer_suppressions/tsan | 18 ------------------ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1c3972a9af7..10cf7f47464 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -120,10 +120,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" task: - name: '[depends, sanitizers: thread (TSan), no gui] [focal]' + name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:focal + image: ubuntu:hirsute cpu: 6 # Increase CPU and Memory to avoid timeout memory: 24G env: diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index d3875fc0454..33f63fa9ba9 100644 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_tsan -export DOCKER_NAME_TAG=ubuntu:20.04 +export DOCKER_NAME_TAG=ubuntu:hirsute export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq" export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'" export GOAL="install" diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index 5b832b57636..b75c015f617 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -3,25 +3,7 @@ # # https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions -# double locks (TODO fix) -mutex:g_genesis_wait_mutex -mutex:Interrupt -mutex:CThreadInterrupt -mutex:CConnman::Interrupt -mutex:CConnman::WakeMessageHandler -mutex:CConnman::ThreadOpenConnections -mutex:CConnman::ThreadOpenAddedConnections -mutex:CConnman::SocketHandler -mutex:UpdateTip -mutex:PeerManagerImpl::UpdatedBlockTip -mutex:g_best_block_mutex - # race (TODO fix) -race:CConnman::WakeMessageHandler -race:CConnman::ThreadMessageHandler -race:fHaveGenesis -race:ProcessNewBlock -race:ThreadImport race:LoadWallet race:WalletBatch::WriteHDChain race:BerkeleyBatch From fadea0bf371a38620b7f1f93f87d1da76d3314e0 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 14 Apr 2021 06:57:38 +0200 Subject: [PATCH 2/2] Revert "test: Add tsan supp for leveldb::DBImpl::DeleteObsoleteFiles" I can no longer observe the need for this suppression. This reverts commit fa1fc536bb26471fd2a6fe8d12f98cf53c646306. --- test/sanitizer_suppressions/tsan | 1 - 1 file changed, 1 deletion(-) diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index b75c015f617..e2c79d56c51 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -9,7 +9,6 @@ race:WalletBatch::WriteHDChain race:BerkeleyBatch race:BerkeleyDatabase race:DatabaseBatch -race:leveldb::DBImpl::DeleteObsoleteFiles race:zmq::* race:bitcoin-qt