From b69d65785588489a8cab605fc327d2a540815198 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 14 Apr 2021 16:51:25 +0200 Subject: [PATCH] Merge #21678: test: Fix TestPotentialDeadLockDetected suppression f2ef5a8afd5da2fb7775dafdee15e6ac532d8fe4 test: Fix TSan suppression (Hennadii Stepanov) Pull request description: This PR is a #21669 follow up, and fixes [locally running `make check`](https://github.com/bitcoin/bitcoin/pull/21669#issuecomment-819403540). ACKs for top commit: MarcoFalke: cr ACK f2ef5a8afd5da2fb7775dafdee15e6ac532d8fe4 Tree-SHA512: bb0c4d1707c6194358d2e9abfed5aa8dd487e014199025fb89f6e5a66d774af041b46a03358a9a5412e1683675c05c42a3b719217d940412ee3fe1ed18a5274c --- test/sanitizer_suppressions/tsan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index 996f342eb9..a5909ee3b0 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -5,7 +5,7 @@ deadlock:WalletBatch # Intentional deadlock in tests -deadlock:TestPotentialDeadLockDetected +deadlock:sync_tests::potential_deadlock_detected # Wildcard for all gui tests, should be replaced with non-wildcard suppressions race:src/qt/test/*