Skip to content

Commit b09af2c

Browse files
committed
ci: instrument libc++ in TSAN job
Qt is disabled, as the build is now taking a very long time.
1 parent 6653caf commit b09af2c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ task:
143143
FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh"
144144

145145
task:
146-
name: 'TSan, depends, gui'
146+
name: 'TSan, depends, no gui'
147147
<< : *GLOBAL_TASK_TEMPLATE
148148
persistent_worker:
149149
labels:

ci/test/00_setup_env_native_tsan.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ export LC_ALL=C.UTF-8
99
export CONTAINER_NAME=ci_native_tsan
1010
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1111
export APT_LLVM_V="20"
12-
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libc++abi-${APT_LLVM_V}-dev libc++-${APT_LLVM_V}-dev python3-zmq"
13-
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
12+
LIBCXX_DIR="/cxx_build/"
13+
LIBCXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"
14+
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} llvm-${APT_LLVM_V}-dev libclang-${APT_LLVM_V}-dev libclang-rt-${APT_LLVM_V}-dev python3-zmq"
15+
export DEP_OPTS="CC=clang CXX=clang++ CXXFLAGS='${LIBCXX_FLAGS}' NO_QT=1"
1416
export GOAL="install"
1517
export CI_LIMIT_STACK_SIZE=1
1618
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DSANITIZERS=thread \
1719
-DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES'"
20+
export USE_INSTRUMENTED_LIBCPP="Thread"

0 commit comments

Comments
 (0)