From ad0c1f89a1dd65a467260214f545a0bd45ad6a29 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 8 Oct 2024 14:21:11 +0200 Subject: [PATCH] Mark the passing UBSAN build as stable (#536) PR #519 added the "AMD64 Arch Linux Usan Function" UBSAN builder with -fno-sanitize=function, but made it unstable and left the existing USAN builder with all checks as stable. We currently need this skip in order to pass, so the Function one should be marked stable (until gh-111178 is fixed & we can merge the two builders again). --- master/custom/builders.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/master/custom/builders.py b/master/custom/builders.py index 58a09cf2..907afe96 100644 --- a/master/custom/builders.py +++ b/master/custom/builders.py @@ -169,10 +169,12 @@ # Special builds: FIPS, ASAN, UBSAN, TraceRefs, Perf, etc. ("AMD64 RHEL8 FIPS Only Blake2 Builtin Hash", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuildExceptBlake2), ("AMD64 Arch Linux Asan", "pablogsal-arch-x86_64", UnixAsanBuild), - ("AMD64 Arch Linux Usan", "pablogsal-arch-x86_64", ClangUbsanLinuxBuild), ("AMD64 Arch Linux Asan Debug", "pablogsal-arch-x86_64", UnixAsanDebugBuild), ("AMD64 Arch Linux TraceRefs", "pablogsal-arch-x86_64", UnixTraceRefsBuild), ("AMD64 Arch Linux Perf", "pablogsal-arch-x86_64", UnixPerfBuild), + # UBSAN with -fno-sanitize=function, without which we currently fail (as + # tracked in gh-111178). The full "AMD64 Arch Linux Usan" is unstable, below + ("AMD64 Arch Linux Usan Function", "pablogsal-arch-x86_64", ClangUbsanFunctionLinuxBuild), # Linux x86 (32-bit) GCC ("x86 Debian Non-Debug with X", "ware-debian-x86", NonDebugUnixBuild), @@ -281,8 +283,8 @@ # riscv64 GCC ("riscv64 Ubuntu23", "onder-riscv64", SlowUnixInstalledBuild), - # Arch Usan Function - ("AMD64 Arch Linux Usan Function", "pablogsal-arch-x86_64", ClangUbsanFunctionLinuxBuild), + # Arch Usan (see stable "AMD64 Arch Linux Usan Function" above) + ("AMD64 Arch Linux Usan", "pablogsal-arch-x86_64", ClangUbsanLinuxBuild), ]