[compiler-rt] 714301d - [compiler-rt/cfi] Convert tests to check 'target=...'

[Paul Robinson via llvm-commits]

Author: Paul Robinson
Date: 2022-12-16T11:10:27-08:00
New Revision: 714301d784308c74724ab30ea566fa14fc01d300

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

LOG: [compiler-rt/cfi] Convert tests to check 'target=...'

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

Added: 
    

Modified: 
    compiler-rt/test/cfi/bad-split.cpp
    compiler-rt/test/cfi/cross-dso-diagnostic.cpp
    compiler-rt/test/cfi/mfcall.cpp
    compiler-rt/test/cfi/target_uninstrumented.cpp
    compiler-rt/test/cfi/two-vcalls.cpp
    compiler-rt/test/crt/dso_handle.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/cfi/bad-split.cpp b/compiler-rt/test/cfi/bad-split.cpp
index dbbd7ecef0ced..9c0c0eee7d850 100644
--- a/compiler-rt/test/cfi/bad-split.cpp
+++ b/compiler-rt/test/cfi/bad-split.cpp
@@ -1,7 +1,7 @@
 // GlobalSplit used to lose type metadata for classes with virtual bases but no virtual methods.
 // RUN: %clangxx_cfi -o %t1 %s && %run %t1
 
-// UNSUPPORTED: windows-msvc
+// UNSUPPORTED: target={{.*windows-msvc.*}}
 
 struct Z {
 };

diff  --git a/compiler-rt/test/cfi/cross-dso-diagnostic.cpp b/compiler-rt/test/cfi/cross-dso-diagnostic.cpp
index b8a88722768e1..f0a2ab4459c5f 100644
--- a/compiler-rt/test/cfi/cross-dso-diagnostic.cpp
+++ b/compiler-rt/test/cfi/cross-dso-diagnostic.cpp
@@ -4,7 +4,7 @@
 // RUN: %clangxx_cfi_diag -g -o %t_exe_suffix %s %ld_flags_rpath_exe
 // RUN: %t_exe_suffix 2>&1 | FileCheck -DDSONAME=%xdynamiclib_namespec %s
 
-// UNSUPPORTED: windows-msvc
+// UNSUPPORTED: target={{.*windows-msvc.*}}
 // REQUIRES: cxxabi
 
 #include <dlfcn.h>

diff  --git a/compiler-rt/test/cfi/mfcall.cpp b/compiler-rt/test/cfi/mfcall.cpp
index 4d561d943f41e..d4666df8d5333 100644
--- a/compiler-rt/test/cfi/mfcall.cpp
+++ b/compiler-rt/test/cfi/mfcall.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows-msvc
+// UNSUPPORTED: target={{.*windows-msvc.*}}
 
 // RUN: %clangxx_cfi -o %t %s
 // RUN: %expect_crash %run %t a

diff  --git a/compiler-rt/test/cfi/target_uninstrumented.cpp b/compiler-rt/test/cfi/target_uninstrumented.cpp
index c2db9d609f47b..8543fdae1446c 100644
--- a/compiler-rt/test/cfi/target_uninstrumented.cpp
+++ b/compiler-rt/test/cfi/target_uninstrumented.cpp
@@ -3,7 +3,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: windows-msvc
+// UNSUPPORTED: target={{.*windows-msvc.*}}
 
 #include <stdio.h>
 #include <string.h>

diff  --git a/compiler-rt/test/cfi/two-vcalls.cpp b/compiler-rt/test/cfi/two-vcalls.cpp
index ff823c498027d..019214d59a45f 100644
--- a/compiler-rt/test/cfi/two-vcalls.cpp
+++ b/compiler-rt/test/cfi/two-vcalls.cpp
@@ -4,7 +4,7 @@
 // This test checks that we don't generate two type checks,
 // if two virtual calls are in the same function.
 
-// UNSUPPORTED: windows-msvc
+// UNSUPPORTED: target={{.*windows-msvc.*}}
 // REQUIRES: cxxabi
 
 // TODO(krasin): implement the optimization to not emit two type checks.

diff  --git a/compiler-rt/test/crt/dso_handle.cpp b/compiler-rt/test/crt/dso_handle.cpp
index a32ce4b8d382b..46d36531386a8 100644
--- a/compiler-rt/test/crt/dso_handle.cpp
+++ b/compiler-rt/test/crt/dso_handle.cpp
@@ -4,7 +4,7 @@
 // RUN: %clangxx -g -o %t -fno-pic -no-pie -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// UNSUPPORTED: arm, aarch64
+// UNSUPPORTED: target={{(arm|aarch64).*}}
 
 #include <stdio.h>