diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-13 19:54:37 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-13 19:54:39 +0200 |
| commit | fadbd9988590ba94e3fd2d87d773f3b09d73ef46 (patch) | |
| tree | 97cd2dc58e0724346fc9000d30c5eff2f3d74466 | |
| parent | a1f0b8b62eb851c837a3618583b7c2fd4d12006c (diff) | |
test: Remove spurious double lock tsan suppressions by bumping to clang-12
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_tsan.sh | 2 | ||||
| -rw-r--r-- | test/sanitizer_suppressions/tsan | 18 |
3 files changed, 3 insertions, 21 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1c3972a9af..10cf7f4746 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 d3875fc045..33f63fa9ba 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 5b832b5763..b75c015f61 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 |