[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. GitOrigin-RevId: 0976d75180f482c1175ea1f204f9bfd56dd163b1
diff --git a/test/aarch64_za_unwind.pass.cpp b/test/aarch64_za_unwind.pass.cpp index 32e77b0..80755a8 100644 --- a/test/aarch64_za_unwind.pass.cpp +++ b/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/test/ra_sign_state.pass.cpp b/test/ra_sign_state.pass.cpp index 4c40789..b661ae0 100644 --- a/test/ra_sign_state.pass.cpp +++ b/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