Skip to content

Commit b8b0d64

Browse files
committed
Merge bitcoin/bitcoin#29740: ci: Print tsan errors to stderr
fa22a43 ci: Print tsan errors to stderr (MarcoFalke) Pull request description: This fixes a bug introduced in bitcoin/bitcoin#27667 All sanitizers print their errors to stderr, except for tsan, which prints to a file and expects the file to be read. Fix this by not using a log file in any sanitizer. ACKs for top commit: dergoegge: utACK fa22a43 Tree-SHA512: 15dca57932a21bda145335fab6367bbf2ae67b25e0b7b61044d2c06ab7a8db3a452f057f6656b81a031726375b7bb238f5ced18ab8894f005e7ab254c7d1ef06
2 parents d04324a + fa22a43 commit b8b0d64

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

ci/test/03_test_script.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -ex
1010

1111
export ASAN_OPTIONS="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:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
13+
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=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
if [ "$CI_OS_NAME" == "macos" ]; then
@@ -71,8 +71,6 @@ elif [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]
7171
fi
7272
fi
7373

74-
mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
75-
7674
if [ "$USE_BUSY_BOX" = "true" ]; then
7775
echo "Setup to use BusyBox utils"
7876
# tar excluded for now because it requires passing in the exact archive type in ./depends (fixed in later BusyBox version)

0 commit comments

Comments
 (0)