Apply suggestions from code review

arrowd · arichardson · web-flow · commit 1f0d8ac87843 · 2025-11-22T10:49:51.000+03:00
Co-authored-by: Alexander Richardson &lt;mail@alexrichardson.me&gt;
diff --git a/libunwind/test/aarch64_vg_unwind.pass.cpp b/libunwind/test/aarch64_vg_unwind.pass.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target-aarch64
-// UNSUPPORTED: system-windows
+// REQUIRES: target={{aarch64-.+}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 #include <libunwind.h>
 #include <stdlib.h>
diff --git a/libunwind/test/aarch64_za_unwind.pass.cpp b/libunwind/test/aarch64_za_unwind.pass.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target-aarch64
-// UNSUPPORTED: system-windows
+// REQUIRES: target={{aarch64-.+}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 #include <libunwind.h>
 #include <stdint.h>
diff --git a/libunwind/test/bad_unwind_info.pass.cpp b/libunwind/test/bad_unwind_info.pass.cpp
@@ -11,8 +11,7 @@
 // sigreturn frame check would previously attempt to access invalid memory in
 // this scenario.
 // REQUIRES: target={{(aarch64|s390x|x86_64)-.+}}
-// UNSUPPORTED: system-windows
-// UNSUPPORTED: target={{.*-windows-gnu}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 // GCC doesn't support __attribute__((naked)) on AArch64.
 // UNSUPPORTED: gcc
diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp
@@ -13,7 +13,7 @@
 
 // clang-format off
 
-// REQUIRES: target-x86_64
+// REQUIRES: target={{x86_64-.+}}
 // REQUIRES: objcopy-available
 
 // TODO: Figure out why this fails with Memory Sanitizer.
diff --git a/libunwind/test/floatregister.pass.cpp b/libunwind/test/floatregister.pass.cpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target-aarch64
-// UNSUPPORTED: system-windows
+// REQUIRES: target={{aarch64-.+}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 // Basic test for float registers number are accepted.
 
diff --git a/libunwind/test/forceunwind.pass.cpp b/libunwind/test/forceunwind.pass.cpp
@@ -7,10 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: system-windows
-// UNSUPPORTED: target={{.*}}-darwin{{.*}}
-// UNSUPPORTED: target={{.*}}-aix{{.*}}
-// UNSUPPORTED: target={{.*-windows-gnu}}
+// UNSUPPORTED: target={{.*-apple.*}}
+// UNSUPPORTED: target={{.*-aix.*}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 // TODO: Figure out why this fails with Memory Sanitizer.
 // XFAIL: msan
diff --git a/libunwind/test/remember_state_leak.pass.sh.s b/libunwind/test/remember_state_leak.pass.sh.s
@@ -6,8 +6,8 @@
 #
 #===------------------------------------------------------------------------===#
 
-# REQUIRES: target-x86_64
-# UNSUPPORTED: system-windows
+# REQUIRES: target={{x86_64-.+}}
+# UNSUPPORTED: target={{.*-windows.*}}
 
 # Inline assembly isn't supported by Memory Sanitizer
 # UNSUPPORTED: msan
diff --git a/libunwind/test/signal_unwind.pass.cpp b/libunwind/test/signal_unwind.pass.cpp
@@ -9,8 +9,7 @@
 
 // Ensure that the unwinder can cope with the signal handler.
 // REQUIRES: target={{(aarch64|loongarch64|riscv64|s390x|x86_64)-.+}}
-// UNSUPPORTED: system-windows
-// UNSUPPORTED: target={{.*-windows-gnu}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 // TODO: Figure out why this fails with Memory Sanitizer.
 // XFAIL: msan
diff --git a/libunwind/test/unwind_leaffunction.pass.cpp b/libunwind/test/unwind_leaffunction.pass.cpp
@@ -9,8 +9,7 @@
 
 // Ensure that leaf function can be unwund.
 // REQUIRES: target={{(aarch64|loongarch64|riscv64|s390x|x86_64)-.+}}
-// UNSUPPORTED: system-windows
-// UNSUPPORTED: target={{.*-windows-gnu}}
+// UNSUPPORTED: target={{.*-windows.*}}
 
 // TODO: Figure out why this fails with Memory Sanitizer.
 // XFAIL: msan
diff --git a/libunwind/test/unwind_scalable_vectors.pass.cpp b/libunwind/test/unwind_scalable_vectors.pass.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target-riscv64
+// REQUIRES: target={{riscv64-.+}}
 
 #undef NDEBUG
 #include <assert.h>

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`#`
`7`	`7`	`#===------------------------------------------------------------------------===#`
`8`	`8`
`9`		`-# REQUIRES: target-x86_64`
`10`		`-# UNSUPPORTED: system-windows`
	`9`	`+# REQUIRES: target={{x86_64-.+}}`
	`10`	`+# UNSUPPORTED: target={{.-windows.}}`
`11`	`11`
`12`	`12`	`# Inline assembly isn't supported by Memory Sanitizer`
`13`	`13`	`# UNSUPPORTED: msan`