Skip to content

Commit ad0c1f8

Browse files
authored
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).
1 parent be039fa commit ad0c1f8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

master/custom/builders.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,12 @@
169169
# Special builds: FIPS, ASAN, UBSAN, TraceRefs, Perf, etc.
170170
("AMD64 RHEL8 FIPS Only Blake2 Builtin Hash", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuildExceptBlake2),
171171
("AMD64 Arch Linux Asan", "pablogsal-arch-x86_64", UnixAsanBuild),
172-
("AMD64 Arch Linux Usan", "pablogsal-arch-x86_64", ClangUbsanLinuxBuild),
173172
("AMD64 Arch Linux Asan Debug", "pablogsal-arch-x86_64", UnixAsanDebugBuild),
174173
("AMD64 Arch Linux TraceRefs", "pablogsal-arch-x86_64", UnixTraceRefsBuild),
175174
("AMD64 Arch Linux Perf", "pablogsal-arch-x86_64", UnixPerfBuild),
175+
# UBSAN with -fno-sanitize=function, without which we currently fail (as
176+
# tracked in gh-111178). The full "AMD64 Arch Linux Usan" is unstable, below
177+
("AMD64 Arch Linux Usan Function", "pablogsal-arch-x86_64", ClangUbsanFunctionLinuxBuild),
176178

177179
# Linux x86 (32-bit) GCC
178180
("x86 Debian Non-Debug with X", "ware-debian-x86", NonDebugUnixBuild),
@@ -281,8 +283,8 @@
281283
# riscv64 GCC
282284
("riscv64 Ubuntu23", "onder-riscv64", SlowUnixInstalledBuild),
283285

284-
# Arch Usan Function
285-
("AMD64 Arch Linux Usan Function", "pablogsal-arch-x86_64", ClangUbsanFunctionLinuxBuild),
286+
# Arch Usan (see stable "AMD64 Arch Linux Usan Function" above)
287+
("AMD64 Arch Linux Usan", "pablogsal-arch-x86_64", ClangUbsanLinuxBuild),
286288
]
287289

288290

0 commit comments

Comments
 (0)