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

Louis Dionne via cfe-commits cfe-commits at lists.llvm.org
Sat Aug 22 05:22:51 PDT 2026


https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/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.

>From 160c9f835e1e8d9ac9ffb5e1c2100ce7f05b54e7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Sat, 22 Aug 2026 07:56:08 -0400
Subject: [PATCH] [libunwind] Make Apple OS version XFAILs robust to
 patch-level versions

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.
---
 libunwind/test/aarch64_za_unwind.pass.cpp | 2 +-
 libunwind/test/ra_sign_state.pass.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
 



More information about the cfe-commits mailing list