Skip to content

Commit

Permalink
Merge bitcoin#19538: ci: Add tsan suppression for race in DatabaseBatch
Browse files Browse the repository at this point in the history
0cdf2a7 ci: add tsan debug symbols option (Russell Yanofsky)
9a2f126 ci: Add tsan suppression for race in DatabaseBatch (Hennadii Stepanov)

Pull request description:

  Since bitcoin#19325 was merged, the corresponding change in TSan suppression file gets required.

  This PR is:
  - an analogous to bitcoin#19226 and bitcoin#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
  • Loading branch information
MarcoFalke authored and vijaydasmp committed Dec 24, 2023
1 parent 181d01e commit fa7c8a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_native_tsan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export DEP_OPTS="NO_UPNP=1 DEBUG=1"
export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
export GOAL="install"
export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --enable-suppress-external-warnings --with-sanitizers=thread"
export BITCOIN_CONFIG="${BITCOIN_CONFIG} CC=clang-15 CXX=clang++-15 CXXFLAGS=-Werror=thread-safety"
export BITCOIN_CONFIG="${BITCOIN_CONFIG} CC=clang-15 CXX=clang++-15 CXXFLAGS='-Werror=thread-safety -g'"
export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
export PYZMQ=true
export RUN_SYMBOL_TESTS=false
3 changes: 3 additions & 0 deletions test/sanitizer_suppressions/tsan
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#
# https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions

# Data races from DatabaseBatch
race:DatabaseBatch

# Data races from zmq namespace
race:zmq::*

Expand Down

0 comments on commit fa7c8a9

Please sign in to comment.