diff options
author | fanquake <fanquake@gmail.com> | 2023-03-28 14:16:12 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-03-28 14:17:30 +0100 |
commit | 220008604f15d5078092dea28be3e3f7f11b6c8f (patch) | |
tree | 57a4d9b5ef9fa5eb0e802b20f0c0a56b6e51652c /ci | |
parent | 8d31d769b7b504104f162a03c94bbc95dec7d849 (diff) | |
parent | faf4aca15a319a26aaec7127455f6db97c7039cc (diff) | |
download | bitcoin-220008604f15d5078092dea28be3e3f7f11b6c8f.tar.xz |
Merge bitcoin/bitcoin#27298: ci: Use TSan new runtime (llvm-16, take 3)
faf4aca15a319a26aaec7127455f6db97c7039cc ci: Use TSan new runtime (llvm-16, take 3) (MarcoFalke)
Pull request description:
The previous two attempts failed:
* llvm-14: Failed in https://github.com/bitcoin/bitcoin/pull/24572
* llvm-15: Failed in https://github.com/bitcoin/bitcoin/pull/26775
However, now that the bug is known and fixed, it should be good to go. See also https://github.com/bitcoin/bitcoin/pull/26775#issuecomment-1380590669
ACKs for top commit:
fanquake:
ACK faf4aca15a319a26aaec7127455f6db97c7039cc - I still see [this](https://github.com/bitcoin/bitcoin/pull/27298#issuecomment-1480041089) failure on aarch64, but that isn't really a regression, as running this tests was already broken for me. I'll open a separate issue, and we can follow up.
Tree-SHA512: 372b53c4d42ca7f527dae4a2b5bc5ab33c816930daf7a3479d20ea7749159a0b19cfd8d76244b95b03130e4a3d12ddbbb74668b8f7e9fc272cf1084f53b7ff9b
Diffstat (limited to 'ci')
-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 61bcd98f0a..e3fa7ab777 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -7,8 +7,8 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_tsan -export CI_IMAGE_NAME_TAG=ubuntu:22.04 -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 CI_IMAGE_NAME_TAG=ubuntu:23.04 # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version). +export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libc++abi-16-dev libc++-16-dev python3-zmq" +export DEP_OPTS="CC=clang-16 CXX='clang++-16 -stdlib=libc++'" export GOAL="install" export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread" |