[Windows] Convert tests to check 'target=<triple>'

Part of the project to eliminate special handling for triples in lit expressions.
llvm · Nov 29, 2022 · df3f5f7 · df3f5f7
1 parent a25f7c5
commit df3f5f7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/clang/test/CodeGenCXX/vtable-debug-info.cpp b/clang/test/CodeGenCXX/vtable-debug-info.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang -emit-llvm -S -g %s -o /dev/null
 // Radar 8730409
-// XFAIL: windows-msvc
+// XFAIL: target={{.*windows-msvc}}
 
 // FIXME: This test crashes on *-pc-win32
 // for lack of debugging support on -integrated-as (MCCOFF).

diff --git a/clang/test/Driver/experimental-library-flag.cpp b/clang/test/Driver/experimental-library-flag.cpp
@@ -1,6 +1,6 @@
 // On some platforms, -stdlib=libc++ is currently ignored, so -lc++experimental is not added.
 // Once -stdlib=libc++ works on those, this XFAIL can be removed.
-// XFAIL: windows, x86_64-scei-ps4, x86_64-sie-ps5
+// XFAIL: target={{.*windows.*}}, x86_64-scei-ps4, x86_64-sie-ps5
 
 // For some reason, this fails with a core dump on AIX. This needs to be investigated.
 // UNSUPPORTED: aix

diff --git a/clang/test/Driver/fat-archive-unbundle-ext.c b/clang/test/Driver/fat-archive-unbundle-ext.c
@@ -1,5 +1,5 @@
 // REQUIRES: x86-registered-target
-// UNSUPPORTED: windows, darwin, aix
+// UNSUPPORTED: target={{.*windows.*}}, darwin, aix
 
 // Generate dummy fat object
 // RUN: %clang -O0 -target %itanium_abi_triple %s -c -o %t.host.o

diff --git a/clang/test/Driver/inhibit-downstream-commands.c b/clang/test/Driver/inhibit-downstream-commands.c
@@ -2,5 +2,5 @@
 // CHECK: error: unknown type name 'invalid'
 // CHECK-NOT: clang: error: assembler command failed
 // CHECK-NOT: clang: error: linker command failed
-// XFAIL: windows-msvc, ps5
+// XFAIL: target={{.*windows-msvc}}, ps5
 invalid C code!
diff --git a/clang/test/Driver/no-integrated-as.s b/clang/test/Driver/no-integrated-as.s
@@ -1,6 +1,6 @@
 ; RUN: %clang -### -no-integrated-as -c %s 2>&1 | FileCheck %s -check-prefix IAS
 ; Windows and PS5 don't support no-integrated-as
-; XFAIL: windows-msvc, ps5
+; XFAIL: target={{.*windows-msvc}}, ps5
 ;
 ; Make sure the current file's filename appears in the output.
 ; We can't generically match on the assembler name, so we just make sure

diff --git a/llvm/test/MC/RISCV/rv32i-aliases-invalid.s b/llvm/test/MC/RISCV/rv32i-aliases-invalid.s
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: target={{.*windows.*}}
 # RUN: not llvm-mc -triple=riscv32 -riscv-no-aliases < %s -o /dev/null 2>&1 | FileCheck %s
 # RUN: not llvm-mc -triple=riscv32 < %s -o /dev/null 2>&1 | FileCheck %s
 

diff --git a/llvm/test/MC/RISCV/rv64i-aliases-invalid.s b/llvm/test/MC/RISCV/rv64i-aliases-invalid.s
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: target={{.*windows.*}}
 # RUN: not llvm-mc -triple=riscv64 -riscv-no-aliases < %s -o /dev/null 2>&1 | FileCheck %s
 # RUN: not llvm-mc -triple=riscv64 < %s 2>&1 -o /dev/null | FileCheck %s