diff options
| author | fanquake <[email protected]> | 2020-06-05 15:58:34 +0800 |
|---|---|---|
| committer | fanquake <[email protected]> | 2020-06-05 16:17:27 +0800 |
| commit | b55b5b6c3d93e3706c3a2b9b2b62bf5c68c5509f (patch) | |
| tree | 8d0a1731a02550d7f636b88ee06398100f018f71 | |
| parent | Merge #19132: qt: lock cs_main, m_cached_tip_mutex in that order (diff) | |
| parent | ci: tsan with wallet (diff) | |
| download | discoin-b55b5b6c3d93e3706c3a2b9b2b62bf5c68c5509f.tar.xz discoin-b55b5b6c3d93e3706c3a2b9b2b62bf5c68c5509f.zip | |
Merge #19164: ci: tsan with wallet
fa7e002d520d8390f3ff4b0383cfdfc14713355d ci: tsan with wallet (MarcoFalke)
Pull request description:
ACKs for top commit:
practicalswift:
ACK fa7e002d520d8390f3ff4b0383cfdfc14713355d -- patch looks correct and Travis is happy
hebasto:
ACK fa7e002d520d8390f3ff4b0383cfdfc14713355d, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 1138459bbef72f402f32dae1e28d96f174901d4248d959b538b973747c8b06f221ecd81a386a1f915c0a2faaefb9fb8f11e3be39e6c5e2468bf9ae43d9f97757
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_tsan.sh | 2 | ||||
| -rw-r--r-- | test/sanitizer_suppressions/tsan | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5550de12d..03ab9d261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,7 +112,7 @@ jobs: FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" - stage: test - name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no wallet, no gui]' + name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]' # Not enough memory on travis machines, so feature_block is excluded for now env: >- TEST_RUNNER_EXTRA="--exclude feature_block" diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 99cf9cd18..87b9d9da9 100644 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -11,4 +11,4 @@ export DOCKER_NAME_TAG=ubuntu:20.04 export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq" export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'" +export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'" diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index f71599d92..fd2e1a329 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -12,17 +12,22 @@ mutex:CConnman::ThreadOpenAddedConnections mutex:CConnman::SocketHandler mutex:UpdateTip mutex:PeerLogicValidation::UpdatedBlockTip +mutex:g_best_block_mutex # race (TODO fix) race:CConnman::WakeMessageHandler race:CConnman::ThreadMessageHandler race:fHaveGenesis race:ProcessNewBlock race:ThreadImport +race:WalletBatch::WriteHDChain race:zmq::* race:bitcoin-qt # deadlock (TODO fix) deadlock:CConnman::ForNode +deadlock:CConnman::GetNodeStats +deadlock:CChainState::ConnectTip deadlock:UpdateTip +deadlock:wallet_tests::CreateWalletFromFile # WalletBatch (unidentified deadlock) deadlock:WalletBatch |