From 791b6d84dace05ae922ae7d54e26bd96c844a448 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 27 Aug 2025 15:42:00 -0500 Subject: [PATCH] ci: Sanitize mpy-cross too. There are no new findings, but this ensures the code paths unique to mpy-cross are checked with the sanitizers. Signed-off-by: Jeff Epler --- tools/ci.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/ci.sh b/tools/ci.sh index d9d77f6900..83b95b1f05 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -530,14 +530,14 @@ CI_UNIX_OPTS_QEMU_RISCV64=( CI_UNIX_OPTS_SANITIZE_ADDRESS=( # Macro MP_ASAN allows detecting ASan on gcc<=13 - CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0 -DMP_ASAN=1" - LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0" + CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0 -fno-sanitize-recover -DMP_ASAN=1" + LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0 -fno-sanitize-recover" ) CI_UNIX_OPTS_SANITIZE_UNDEFINED=( # Macro MP_UBSAN allows detecting UBSan on gcc<=13 - CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute -DMP_UBSAN=1" - LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute" + CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute -fno-sanitize-recover -DMP_UBSAN=1" + LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute -fno-sanitize-recover" ) function ci_unix_build_helper { @@ -774,7 +774,7 @@ function ci_unix_settrace_stackless_run_tests { } function ci_unix_sanitize_undefined_build { - make ${MAKEOPTS} -C mpy-cross + make ${MAKEOPTS} -C mpy-cross "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}" make ${MAKEOPTS} -C ports/unix submodules make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}" ci_unix_build_ffi_lib_helper gcc @@ -785,7 +785,7 @@ function ci_unix_sanitize_undefined_run_tests { } function ci_unix_sanitize_address_build { - make ${MAKEOPTS} -C mpy-cross + make ${MAKEOPTS} -C mpy-cross "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}" make ${MAKEOPTS} -C ports/unix submodules make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}" ci_unix_build_ffi_lib_helper gcc