Skip to content

Commit fd59670

Browse files
author
MarcoFalke
committed
Merge #19538: ci: Add tsan suppression for race in DatabaseBatch
0cdf2a7 ci: add tsan debug symbols option (Russell Yanofsky) 9a2f126 ci: Add tsan suppression for race in DatabaseBatch (Hennadii Stepanov) Pull request description: Since #19325 was merged, the corresponding change in TSan suppression file gets required. This PR is: - an analogous to #19226 and #19450, and - a temporary workaround for CI fail like https://cirrus-ci.com/task/5741795508224000?command=ci#L4993 ACKs for top commit: MarcoFalke: ACK 0cdf2a7 Tree-SHA512: 7832f143887c8a0df99dea03e00694621710378fbe923e3592185fcd3658546a590693b513abffc5ab96e9ef76c9c4bff3330eeee69a0c5dbe7574f34c417220
2 parents c044858 + 0cdf2a7 commit fd59670

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
1212
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
1313
export TEST_RUNNER_EXTRA="--exclude feature_block --timeout-factor=4" # Increase timeout because sanitizers slow down. Low memory on Travis machines, exclude feature_block.
1414
export GOAL="install"
15-
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
15+
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"

test/sanitizer_suppressions/tsan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ race:LoadWallet
2323
race:WalletBatch::WriteHDChain
2424
race:BerkeleyBatch
2525
race:BerkeleyDatabase
26+
race:DatabaseBatch
2627
race:zmq::*
2728
race:bitcoin-qt
2829
# deadlock (TODO fix)

0 commit comments

Comments
 (0)