diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-16 08:21:54 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-16 08:21:57 +0100 |
| commit | 760651214cd205b91804bc1c40a31c614d3aa26c (patch) | |
| tree | 89c42003204a0c1cdfe02e17094d465313b6ee52 | |
| parent | 7b83c7d609ba61c5726650208b53111eb11a4b0e (diff) | |
| parent | fa43933e3b3f8bd2992340bdd744fdab680565f8 (diff) | |
| download | bitcoin-760651214cd205b91804bc1c40a31c614d3aa26c.tar.xz | |
Merge bitcoin/bitcoin#24572: ci: Temporarily use clang-13 to work around clang-14 TSan bug
fa43933e3b3f8bd2992340bdd744fdab680565f8 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 fa43933e3b3f8bd2992340bdd744fdab680565f8, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: adf7d385e1cddaeb2d06c3a3838f87070fb4ffdcc9a37da204b332ab28f40042bd34bd8b6d1d4710511865b4acafa7cf7303c4abf59862c5d29b168e2774da31
| -rwxr-xr-x | ci/test/00_setup_env_native_tsan.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 0036255caf..ae942d892b 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_tsan export DOCKER_NAME_TAG=ubuntu:22.04 -export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq" -export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'" +export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq" +export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'" +export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'" |