Skip to content

Commit 2c90f8e

Browse files
committed
Merge bitcoin/bitcoin#31232: ci: add second_deadlock_stack=1 to TSAN options
5161c26 ci: add second_deadlock_stack=1 to TSAN options (fanquake) Pull request description: This is mentioned in the developer notes, but isn't present in `TSAN_OPTIONS`, resulting in: ```bash WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock) (pid=60508) Cycle in lock order graph: M0 (0xffff98e02208) => M1 (0xffff98e0cbe8) => M2 (0xffff98e0cd98) => M0 <snip> Hint: use TSAN_OPTIONS=second_deadlock_stack=1 to get more informative warning message ``` Add it, for (potentially) more informative output, when failures occur. Checked that adding does output more information. ACKs for top commit: maflcko: lgtm ACK 5161c26 hebasto: ACK 5161c26. Tree-SHA512: 57bfa24d248ed76ba0db537edff425453a0765c4768fc1b6f59a87876d4acf63ed38bb3c20f369a008ae256472d9d24e58d76729d423f662dfdb2952afc46cb0
2 parents 45e2f8f + 5161c26 commit 2c90f8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/test/03_test_script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -ex
1010

1111
export ASAN_OPTIONS="detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
1212
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
13-
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1"
13+
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:second_deadlock_stack=1"
1414
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
1515

1616
echo "Number of available processing units: $(nproc)"

0 commit comments

Comments
 (0)