tools/ci: Add UBSan to longlong CI build.

projectgus · projectgus · commit d81d56cc4d7c · 2025-08-19T10:33:40.000+10:00
Also rewrite the sanitizer argument variables to not assume a variant.

longlong variant currently fails in this config, due to a bug fixed
in follow-up commit.

Signed-off-by: Angus Gratton &lt;angus@redyak.com.au&gt;
diff --git a/tools/ci.sh b/tools/ci.sh
@@ -518,13 +518,11 @@ CI_UNIX_OPTS_QEMU_RISCV64=(
 )
 
 CI_UNIX_OPTS_SANITIZE_ADDRESS=(
-    VARIANT=coverage
     CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
     LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"
 )
 
 CI_UNIX_OPTS_SANITIZE_UNDEFINED=(
-    VARIANT=coverage
     CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
     LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"
 )
@@ -699,7 +697,7 @@ function ci_unix_nanbox_run_tests {
 }
 
 function ci_unix_longlong_build {
-    ci_unix_build_helper VARIANT=longlong
+    ci_unix_build_helper VARIANT=longlong "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
 }
 
 function ci_unix_longlong_run_tests {
@@ -765,23 +763,23 @@ function ci_unix_settrace_stackless_run_tests {
 function ci_unix_sanitize_undefined_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules
-    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
     ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_sanitize_undefined_run_tests {
-    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
 }
 
 function ci_unix_sanitize_address_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules
-    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
     ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_sanitize_address_run_tests {
-    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+    MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
 }
 
 function ci_unix_macos_build {

Original file line number	Diff line number	Diff line change
`@@ -518,13 +518,11 @@ CI_UNIX_OPTS_QEMU_RISCV64=(`
`518`	`518`	`)`
`519`	`519`
`520`	`520`	`CI_UNIX_OPTS_SANITIZE_ADDRESS=(`
`521`		`- VARIANT=coverage`
`522`	`521`	`CFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"`
`523`	`522`	`LDFLAGS_EXTRA="-fsanitize=address --param asan-use-after-return=0"`
`524`	`523`	`)`
`525`	`524`
`526`	`525`	`CI_UNIX_OPTS_SANITIZE_UNDEFINED=(`
`527`		`- VARIANT=coverage`
`528`	`526`	`CFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"`
`529`	`527`	`LDFLAGS_EXTRA="-fsanitize=undefined -fno-sanitize=nonnull-attribute"`
`530`	`528`	`)`
`@@ -699,7 +697,7 @@ function ci_unix_nanbox_run_tests {`
`699`	`697`	`}`
`700`	`698`
`701`	`699`	`function ci_unix_longlong_build {`
`702`		`- ci_unix_build_helper VARIANT=longlong`
	`700`	`+ ci_unix_build_helper VARIANT=longlong "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"`
`703`	`701`	`}`
`704`	`702`
`705`	`703`	`function ci_unix_longlong_run_tests {`
`@@ -765,23 +763,23 @@ function ci_unix_settrace_stackless_run_tests {`
`765`	`763`	`function ci_unix_sanitize_undefined_build {`
`766`	`764`	`make ${MAKEOPTS} -C mpy-cross`
`767`	`765`	`make ${MAKEOPTS} -C ports/unix submodules`
`768`		`- make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"`
	`766`	`+ make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"`
`769`	`767`	`ci_unix_build_ffi_lib_helper gcc`
`770`	`768`	`}`
`771`	`769`
`772`	`770`	`function ci_unix_sanitize_undefined_run_tests {`
`773`		`- MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"`
	`771`	`+ MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"`
`774`	`772`	`}`
`775`	`773`
`776`	`774`	`function ci_unix_sanitize_address_build {`
`777`	`775`	`make ${MAKEOPTS} -C mpy-cross`
`778`	`776`	`make ${MAKEOPTS} -C ports/unix submodules`
`779`		`- make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"`
	`777`	`+ make ${MAKEOPTS} -C ports/unix VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"`
`780`	`778`	`ci_unix_build_ffi_lib_helper gcc`
`781`	`779`	`}`
`782`	`780`
`783`	`781`	`function ci_unix_sanitize_address_run_tests {`
`784`		`- MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"`
	`782`	`+ MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage VARIANT=coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"`
`785`	`783`	`}`
`786`	`784`
`787`	`785`	`function ci_unix_macos_build {`