From fa4b659dcd034f67bc61af242c951cec409dfe14 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Sun, 8 Jun 2025 09:55:16 +0200
Subject: [PATCH 1/2] test: Explain how to reproduce zmq:: upstream race

---
 test/sanitizer_suppressions/tsan | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan
index 298ad175da0..06cc63510fa 100644
--- a/test/sanitizer_suppressions/tsan
+++ b/test/sanitizer_suppressions/tsan
@@ -6,8 +6,6 @@
 # race (TODO fix)
 race:LoadWallet
 race:DatabaseBatch
-race:zmq::*
-race:bitcoin-qt
 
 # deadlock (TODO fix)
 # To reproduce, see:
@@ -17,13 +15,18 @@ deadlock:Chainstate::ConnectTip
 # Intentional deadlock in tests
 deadlock:sync_tests::potential_deadlock_detected
 
-# Wildcard for all gui tests, should be replaced with non-wildcard suppressions
+# Wildcard for all of the gui, should be replaced with non-wildcard suppressions
+race:bitcoin-qt
 race:src/qt/test/*
 deadlock:src/qt/test/*
 
 # External libraries
+# ------------------
 race:libzmq
 
+# To reproduce, build from depends with CFLAGS='-O0 -g' CXXFLAGS='-O0 -g'
+race:zmq::*
+
 # Intermittent issues
 # -------------------
 #

From fa0b766f43df2ead7413363941d74244a55f090c Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Mon, 9 Jun 2025 16:30:50 +0200
Subject: [PATCH 2/2] test: Remove intermittent and presumed fixed tsan race
 suppressions

LoadWallet was added in commit d77170d52687c3d708daffb7976c3e0d345ff7dc, which
points to a traceback with BerkeleyBatch in it. Now that BDB is removed,
this can be removed as well.

The race in DatabaseBatch was added in commit
fd59670642f511523570607b752ae409b5e04e7d, which does not point to a
traceback. This was likely also fixed with the BDB removal.

If not, the suppressions should be added back, mentioning that they are
intermittent and including a traceback and possibly steps to reproduce.
---
 test/sanitizer_suppressions/tsan | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan
index 06cc63510fa..ab50e837082 100644
--- a/test/sanitizer_suppressions/tsan
+++ b/test/sanitizer_suppressions/tsan
@@ -3,10 +3,6 @@
 #
 # https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
 
-# race (TODO fix)
-race:LoadWallet
-race:DatabaseBatch
-
 # deadlock (TODO fix)
 # To reproduce, see:
 # https://github.com/bitcoin/bitcoin/issues/19303#issuecomment-1514926359