Skip to content

Commit 6a282f4

Browse files
fanquakeUdjinM6
authored andcommitted
Merge bitcoin#27298: ci: Use TSan new runtime (llvm-16, take 3)
faf4aca ci: Use TSan new runtime (llvm-16, take 3) (MarcoFalke) Pull request description: The previous two attempts failed: * llvm-14: Failed in bitcoin#24572 * llvm-15: Failed in bitcoin#26775 However, now that the bug is known and fixed, it should be good to go. See also bitcoin#26775 (comment) ACKs for top commit: fanquake: ACK faf4aca - I still see [this](bitcoin#27298 (comment)) 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
1 parent d9c549e commit 6a282f4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.cirrus.yml

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

6666
task:
67-
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]'
67+
name: 'x86_64 Linux [GOAL: install] [lunar] [depends, sanitizers: thread (TSan), no gui]'
6868
<< : *GLOBAL_TASK_TEMPLATE
6969
container:
70-
image: ubuntu:focal
70+
image: ubuntu:lunar
7171
cpu: 4 # Double CPU and Memory to avoid timeout
7272
memory: 16G
7373
env:

ci/test/00_setup_env_native_tsan.sh

Lines changed: 2 additions & 2 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 PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
11-
export DEP_OPTS="CC=clang-15 CXX='clang++-15 -stdlib=libc++"
10+
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libc++abi-16-dev libc++-16-dev python3-zmq"
11+
export DEP_OPTS="CC=clang-16 CXX='clang++-16 -stdlib=libc++'"
1212
export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
1313
export TEST_RUNNER_EXTRA="${TEST_RUNNER_EXTRA} --timeout-factor=4" # Increase timeout because sanitizers slow down
1414
export GOAL="install"

0 commit comments

Comments
 (0)