Skip to content

Commit b55b5b6

Browse files
committed
Merge #19164: ci: tsan with wallet
fa7e002 ci: tsan with wallet (MarcoFalke) Pull request description: ACKs for top commit: practicalswift: ACK fa7e002 -- patch looks correct and Travis is happy hebasto: ACK fa7e002, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 1138459bbef72f402f32dae1e28d96f174901d4248d959b538b973747c8b06f221ecd81a386a1f915c0a2faaefb9fb8f11e3be39e6c5e2468bf9ae43d9f97757
2 parents f4f2220 + fa7e002 commit b55b5b6

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
113113
114114
- stage: test
115-
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no wallet, no gui]'
115+
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]'
116116
# Not enough memory on travis machines, so feature_block is excluded for now
117117
env: >-
118118
TEST_RUNNER_EXTRA="--exclude feature_block"

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ export DOCKER_NAME_TAG=ubuntu:20.04
1111
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
1212
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"

test/sanitizer_suppressions/tsan

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,22 @@ mutex:CConnman::ThreadOpenAddedConnections
1212
mutex:CConnman::SocketHandler
1313
mutex:UpdateTip
1414
mutex:PeerLogicValidation::UpdatedBlockTip
15+
mutex:g_best_block_mutex
1516
# race (TODO fix)
1617
race:CConnman::WakeMessageHandler
1718
race:CConnman::ThreadMessageHandler
1819
race:fHaveGenesis
1920
race:ProcessNewBlock
2021
race:ThreadImport
22+
race:WalletBatch::WriteHDChain
2123
race:zmq::*
2224
race:bitcoin-qt
2325
# deadlock (TODO fix)
2426
deadlock:CConnman::ForNode
27+
deadlock:CConnman::GetNodeStats
28+
deadlock:CChainState::ConnectTip
2529
deadlock:UpdateTip
30+
deadlock:wallet_tests::CreateWalletFromFile
2631

2732
# WalletBatch (unidentified deadlock)
2833
deadlock:WalletBatch

0 commit comments

Comments
 (0)