Skip to content

Commit c81c6bf

Browse files
committed
Merge bitcoin#30665: test: Enable detect_leaks=1 in ASAN_OPTIONS explicitly
cccc5bf 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 cccc5bf Tree-SHA512: ed284abd05c7a99c30b509844aa75785a5ccb506d8296a71347b4c328750a6a4ed1f87e7a3ec36ab17f27b467c033cc8ca5eb5e2b951f2ae7473327c5eb1ddae
2 parents 55d663c + cccc5bf commit c81c6bf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ci/test/03_test_script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
set -ex
1010

11-
export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
11+
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"
1313
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"

test/fuzz/test_runner.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ def get_fuzz_env(*, target, source_dir):
2323
'FUZZ': target,
2424
'UBSAN_OPTIONS':
2525
f'suppressions={source_dir}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1',
26-
'UBSAN_SYMBOLIZER_PATH':symbolizer,
27-
"ASAN_OPTIONS": "detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1",
28-
'ASAN_SYMBOLIZER_PATH':symbolizer,
29-
'MSAN_SYMBOLIZER_PATH':symbolizer,
26+
'UBSAN_SYMBOLIZER_PATH': symbolizer,
27+
"ASAN_OPTIONS": "detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1",
28+
'ASAN_SYMBOLIZER_PATH': symbolizer,
29+
'MSAN_SYMBOLIZER_PATH': symbolizer,
3030
}
3131
if platform.system() == "Windows":
3232
# On Windows, `env` option must include valid `SystemRoot`.

0 commit comments

Comments
 (0)