Skip to content

Commit 7606512

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24572: ci: Temporarily use clang-13 to work around clang-14 TSan bug
fa43933 ci: Temporarily use clang-13 to work around clang-14 TSan bug (MarcoFalke) Pull request description: There is an increase in intermittent issues in the TSan task. The increase correlates with Ubuntu Jammy's bump of `clang` from `clang-13` to `clang-14`. Temporarily work around that. ACKs for top commit: hebasto: ACK fa43933, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: adf7d385e1cddaeb2d06c3a3838f87070fb4ffdcc9a37da204b332ab28f40042bd34bd8b6d1d4710511865b4acafa7cf7303c4abf59862c5d29b168e2774da31
2 parents 7b83c7d + fa43933 commit 7606512

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/test/00_setup_env_native_tsan.sh

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

99
export CONTAINER_NAME=ci_native_tsan
1010
export DOCKER_NAME_TAG=ubuntu:22.04
11-
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
12-
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
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"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"

0 commit comments

Comments
 (0)