[clang] fe21126 - [Windows] Convert tests to check 'target=...'

[Paul Robinson via cfe-commits]

Author: Paul Robinson
Date: 2022-12-06T13:15:48-08:00
New Revision: fe2112611258f9a16f101d642f3dfe7a47a161d7

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

LOG: [Windows] Convert tests to check 'target=...'

Part of the project to eliminate special handling for triples in lit
expressions.

Added: 
    

Modified: 
    clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
    llvm/test/DebugInfo/MIR/X86/no-cfi-loc.mir
    llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll
    llvm/test/ExecutionEngine/MCJIT/eh.ll
    llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
    llvm/test/ExecutionEngine/MCJIT/remote/eh.ll

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
index bcd2a9f67708c..daed3baf4643e 100644
--- a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
+++ b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -no-enable-noundef-analysis %s -o - -emit-llvm | FileCheck %s
-// XFAIL: aarch64, arm64, x86_64-pc-windows-msvc, x86_64-w64-windows-gnu, x86_64-pc-windows-gnu
+// XFAIL: target={{(aarch64|arm64).*}}, target=x86_64-pc-windows-msvc, target=x86_64-{{(pc|w64)}}-windows-gnu
 
 // PR1513
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/no-cfi-loc.mir b/llvm/test/DebugInfo/MIR/X86/no-cfi-loc.mir
index 2c38dedad545d..8ba64c47cb38b 100644
--- a/llvm/test/DebugInfo/MIR/X86/no-cfi-loc.mir
+++ b/llvm/test/DebugInfo/MIR/X86/no-cfi-loc.mir
@@ -4,7 +4,7 @@
 #
 # CHECK-NOT: .loc 1 0
 # CHECK:     .cfi_def_cfa_offset
-# UNSUPPORTED: cygwin,windows-gnu,windows-msvc
+# UNSUPPORTED: target={{.*-(cygwin|windows-gnu|windows-msvc)}}
 
 --- |
   ; ModuleID = 'no-cfi-loc.ll'

diff  --git a/llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll b/llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll
index 02cb98c9da0e5..ac2b7b9409c78 100644
--- a/llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll
+++ b/llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll
@@ -10,7 +10,7 @@
 
 ; On Windows, we don't handle the relocations needed for AT_return_pc properly
 ; and fail with "failed to compute relocation: IMAGE_REL_AMD64_ADDR32".
-; UNSUPPORTED: cygwin,windows-gnu,windows-msvc
+; UNSUPPORTED: target={{.*-(cygwin|windows-gnu|windows-msvc)}}
 
 ; RUN: llc -mtriple=x86_64 < %s -o - | FileCheck %s -check-prefix=ASM
 ; RUN: llc -mtriple=x86_64 -debugger-tune=lldb < %s -filetype=obj -o %t.o

diff  --git a/llvm/test/ExecutionEngine/MCJIT/eh.ll b/llvm/test/ExecutionEngine/MCJIT/eh.ll
index 571f92d4a947f..73bade5e30ea0 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=mcjit %s
 
-; XFAIL: arm, cygwin, windows-msvc, windows-gnu
+; XFAIL: target=arm{{.*}}, target={{.*-(cygwin|windows-msvc|windows-gnu)}}
 declare ptr @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(ptr, ptr, ptr)
 declare i32 @__gxx_personality_v0(...)

diff  --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
index f3e837b80e149..39c7f342ab1f2 100644
--- a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
 
-; XFAIL: arm, cygwin, windows-msvc, windows-gnu
+; XFAIL: target=arm{{.*}}, target={{.*-(cygwin|windows-msvc|windows-gnu)}}
 declare ptr @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(ptr, ptr, ptr)
 declare i32 @__gxx_personality_v0(...)

diff  --git a/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll b/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
index c7e4b128e30d3..be96ac4c517e3 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/eh.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
-; XFAIL: arm, cygwin, windows-msvc, windows-gnu
+; XFAIL: target=arm{{.*}}, target={{.*-(cygwin|windows-msvc|windows-gnu)}}
 ; UNSUPPORTED: powerpc64-unknown-linux-gnu
 ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
 ; FIXME: Something hangs here.