foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

Merge bitcoin/bitcoin#26775: ci: Revert tsan task changes

Browse source 
fabb6af850 ci: Remove duplicate CC and CXX from tsan task (MarcoFalke)
fa5d9a0e24 Revert "ci: Use clang-15 in tsan task" (MarcoFalke)
faa835e7e5 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 fabb6af850, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: d62203049847ab9095ee3fc89e18bdd721d1d9d5a7ef7a9f524c80e6be58d1d9f6aa2f14533df1ea77eb59597fba6fa9b987b17eb03b2c3f7cb577ab59cd59c0
This commit is contained in:
MarcoFalke 2023-01-01 10:25:26 +01:00
commit d8bdee0fc8
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -228,10 +228,10 @@ task:
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
task: task:
name: '[TSan, depends] [bookworm]' name: '[TSan, depends, gui] [jammy]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
image: debian:bookworm image: ubuntu:jammy
cpu: 6 # Increase CPU and Memory to avoid timeout cpu: 6 # Increase CPU and Memory to avoid timeout
memory: 24G memory: 24G
env: env:

6
ci/test/00_setup_env_native_tsan.sh
View file

@ -7,8 +7,8 @@
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_native_tsan export CONTAINER_NAME=ci_native_tsan
export DOCKER_NAME_TAG=debian:bookworm # For clang-15 export DOCKER_NAME_TAG=ubuntu:22.04
export PACKAGES="clang-15 llvm-15 libc++abi-15-dev libc++-15-dev python3-zmq" export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
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 export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
export GOAL="install" export GOAL="install"
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread" export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"

3
test/sanitizer_suppressions/tsan
View file

@ -35,5 +35,8 @@ race:libzmq
# https://github.com/bitcoin/bitcoin/issues/20618 # https://github.com/bitcoin/bitcoin/issues/20618
race:CZMQAbstractPublishNotifier::SendZmqMessage race:CZMQAbstractPublishNotifier::SendZmqMessage
# https://github.com/bitcoin/bitcoin/pull/20218, https://github.com/bitcoin/bitcoin/pull/20745
race:epoll_ctl
# https://github.com/bitcoin/bitcoin/issues/23366 # https://github.com/bitcoin/bitcoin/issues/23366
race:std::__1::ios_base::* race:std::__1::ios_base::*