diff options
| author | merge-script <fanquake@gmail.com> | 2024-08-23 13:12:53 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-08-23 13:12:53 +0100 |
| commit | c81c6bf65b34eb91c98768e6b4f46e450ccfd779 (patch) | |
| tree | 6da394fe34cb7af0fcd07e659bca0bfadaa5f2ca | |
| parent | 55d663cb15151773cd043fc9535d6245f8ba6c99 (diff) | |
| parent | cccc5bfd35a008adf08d99ed463fe00d6a6f29c0 (diff) | |
Merge bitcoin/bitcoin#30665: test: Enable detect_leaks=1 in ASAN_OPTIONS explicitly
cccc5bfd35a008adf08d99ed463fe00d6a6f29c0 test: Enable detect_leaks=1 in ASAN_OPTIONS explicitly (MarcoFalke)
Pull request description:
It should be enabled by default, but being explicit can't hurt.
ACKs for top commit:
fanquake:
ACK cccc5bfd35a008adf08d99ed463fe00d6a6f29c0
Tree-SHA512: ed284abd05c7a99c30b509844aa75785a5ccb506d8296a71347b4c328750a6a4ed1f87e7a3ec36ab17f27b467c033cc8ca5eb5e2b951f2ae7473327c5eb1ddae
| -rwxr-xr-x | ci/test/03_test_script.sh | 2 | ||||
| -rwxr-xr-x | test/fuzz/test_runner.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index 71d9ad7f72..1d7a9d76db 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 set -ex -export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1" +export ASAN_OPTIONS="detect_leaks=1: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" export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1" diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py index c74246ef45..9917eca75a 100755 --- a/test/fuzz/test_runner.py +++ b/test/fuzz/test_runner.py @@ -23,10 +23,10 @@ def get_fuzz_env(*, target, source_dir): 'FUZZ': target, 'UBSAN_OPTIONS': f'suppressions={source_dir}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1', - 'UBSAN_SYMBOLIZER_PATH':symbolizer, - "ASAN_OPTIONS": "detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1", - 'ASAN_SYMBOLIZER_PATH':symbolizer, - 'MSAN_SYMBOLIZER_PATH':symbolizer, + 'UBSAN_SYMBOLIZER_PATH': symbolizer, + "ASAN_OPTIONS": "detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1", + 'ASAN_SYMBOLIZER_PATH': symbolizer, + 'MSAN_SYMBOLIZER_PATH': symbolizer, } if platform.system() == "Windows": # On Windows, `env` option must include valid `SystemRoot`. |