Skip to content

Commit d8bdee0

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26775: ci: Revert tsan task changes
fabb6af ci: Remove duplicate CC and CXX from tsan task (MarcoFalke) fa5d9a0 Revert "ci: Use clang-15 in tsan task" (MarcoFalke) faa835e Revert "test: Drop no longer needed `race:epoll_ctl` TSan suppression" (MarcoFalke) Pull request description: Looks like there are still bugs in clang-15, so we need to roll back all the way to the previously used version (clang-13). ACKs for top commit: hebasto: ACK fabb6af, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: d62203049847ab9095ee3fc89e18bdd721d1d9d5a7ef7a9f524c80e6be58d1d9f6aa2f14533df1ea77eb59597fba6fa9b987b17eb03b2c3f7cb577ab59cd59c0
2 parents 8575d5d + fabb6af commit d8bdee0

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ task:
228228
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
229229

230230
task:
231-
name: '[TSan, depends] [bookworm]'
231+
name: '[TSan, depends, gui] [jammy]'
232232
<< : *GLOBAL_TASK_TEMPLATE
233233
container:
234-
image: debian:bookworm
234+
image: ubuntu:jammy
235235
cpu: 6 # Increase CPU and Memory to avoid timeout
236236
memory: 24G
237237
env:

ci/test/00_setup_env_native_tsan.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export DOCKER_NAME_TAG=debian:bookworm # For clang-15
11-
export PACKAGES="clang-15 llvm-15 libc++abi-15-dev libc++-15-dev python3-zmq"
12-
export DEP_OPTS="CC=clang-15 CXX='clang++-15 -stdlib=libc++' NO_QR=1" # qr disabled due to libqrencode 3.4.4 compile failure, https://github.com/bitcoin/bitcoin/pull/26768#issuecomment-1367403430
10+
export DOCKER_NAME_TAG=ubuntu:22.04
11+
export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"

test/sanitizer_suppressions/tsan

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@ race:libzmq
3535
# https://github.com/bitcoin/bitcoin/issues/20618
3636
race:CZMQAbstractPublishNotifier::SendZmqMessage
3737

38+
# https://github.com/bitcoin/bitcoin/pull/20218, https://github.com/bitcoin/bitcoin/pull/20745
39+
race:epoll_ctl
40+
3841
# https://github.com/bitcoin/bitcoin/issues/23366
3942
race:std::__1::ios_base::*

0 commit comments

Comments
 (0)