diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-27 11:06:37 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-27 11:07:02 +0000 |
| commit | b8b0d6476573e025e1acbbf5df9aa76dc4838f79 (patch) | |
| tree | d999888056fadcb3d46b9bcad7c44646605d65b3 | |
| parent | d04324a7056a735c1127ba8ccdc720a16e7281a3 (diff) | |
| parent | fa22a438fa8f1c9cd4b4c44ff45cefd178bf5999 (diff) | |
Merge bitcoin/bitcoin#29740: ci: Print tsan errors to stderr
fa22a438fa8f1c9cd4b4c44ff45cefd178bf5999 ci: Print tsan errors to stderr (MarcoFalke)
Pull request description:
This fixes a bug introduced in https://github.com/bitcoin/bitcoin/pull/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 fa22a438fa8f1c9cd4b4c44ff45cefd178bf5999
Tree-SHA512: 15dca57932a21bda145335fab6367bbf2ae67b25e0b7b61044d2c06ab7a8db3a452f057f6656b81a031726375b7bb238f5ced18ab8894f005e7ab254c7d1ef06
| -rwxr-xr-x | ci/test/03_test_script.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index d85e24a5c0..f5da7bc55d 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -10,7 +10,7 @@ set -ex export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1" export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan" -export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan" +export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1" export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1" if [ "$CI_OS_NAME" == "macos" ]; then @@ -71,8 +71,6 @@ elif [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ] fi fi -mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/" - if [ "$USE_BUSY_BOX" = "true" ]; then echo "Setup to use BusyBox utils" # tar excluded for now because it requires passing in the exact archive type in ./depends (fixed in later BusyBox version) |