[libunwind] 0976d75 - [libunwind] Make Apple OS version XFAILs robust to patch-level versions (#218125)

[via cfe-commits]

Author: Louis Dionne
Date: 2026-08-23T08:04:55-04:00
New Revision: 0976d75180f482c1175ea1f204f9bfd56dd163b1

URL: https://github.com/llvm/llvm-project/commit/0976d75180f482c1175ea1f204f9bfd56dd163b1
DIFF: https://github.com/llvm/llvm-project/commit/0976d75180f482c1175ea1f204f9bfd56dd163b1.diff

LOG: [libunwind] Make Apple OS version XFAILs robust to patch-level versions (#218125)

We are seeing some failures since some of the Apple CI runners have been
updated to 26.5.2. That was caused by the regular expressions not
matching patch level version bumps.

Added: 
    

Modified: 
    libunwind/test/aarch64_za_unwind.pass.cpp
    libunwind/test/ra_sign_state.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libunwind/test/aarch64_za_unwind.pass.cpp b/libunwind/test/aarch64_za_unwind.pass.cpp
index 32e77b0bd621b..80755a8ecc61d 100644
--- a/libunwind/test/aarch64_za_unwind.pass.cpp
+++ b/libunwind/test/aarch64_za_unwind.pass.cpp
@@ -11,7 +11,7 @@
 
 // Fails on targets that support SME but where the system libunwind is too old
 // to disable ZA before resuming from unwinding.
-// UNSUPPORTED: stdlib=system && target={{.+}}-apple-{{.*}}{{(11|12|13|14|15|26)(\.\d+)?}}
+// UNSUPPORTED: stdlib=system && target={{.+}}-apple-{{.*}}{{(11|12|13|14|15|26)(\.\d+)*}}
 
 #include <alloca.h>
 #include <libunwind.h>

diff  --git a/libunwind/test/ra_sign_state.pass.cpp b/libunwind/test/ra_sign_state.pass.cpp
index 4c407890245a0..b661ae04d9e5b 100644
--- a/libunwind/test/ra_sign_state.pass.cpp
+++ b/libunwind/test/ra_sign_state.pass.cpp
@@ -14,8 +14,8 @@
 
 // The libSystem unwinder does not correctly read UNW_AARCH64_RA_SIGN_STATE, at
 // least through OS version 27.0
-// XFAIL: stdlib=apple-libc++ && target={{.*}}-apple-{{.*}}{{(11|12|13|14|15|26)(\.\d+)?}}
-// XFAIL: stdlib=apple-libc++ && target={{.*}}-apple-{{.*}}27.0
+// XFAIL: stdlib=apple-libc++ && target={{.*}}-apple-{{.*}}{{(11|12|13|14|15|26)(\.\d+)*}}
+// XFAIL: stdlib=apple-libc++ && target={{.*}}-apple-{{.*}}27.0{{(\.\d+)*}}
 
 // clang-format on