From e0f2150e99e5e429c33047f25e3da2ab146d0f57 Mon Sep 17 00:00:00 2001
From: Paul Robinson <paul.robinson@sony.com>
Date: Thu, 15 Dec 2022 12:25:59 -0800
Subject: [PATCH] [clang] Convert tests to check 'target=...'

Part of the project to eliminate special handling for triples in lit
expressions.
---
 clang/test/Analysis/checker-plugins.c | 2 +-
 clang/test/CodeGen/c-strings.c        | 4 ++--
 clang/test/PCH/leakfiles.test         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/clang/test/Analysis/checker-plugins.c b/clang/test/Analysis/checker-plugins.c
index 69fab8f..92a48de 100644
--- a/clang/test/Analysis/checker-plugins.c
+++ b/clang/test/Analysis/checker-plugins.c
@@ -2,7 +2,7 @@
 
 // FIXME: This test fails on clang-stage2-cmake-RgSan,
 // see also https://reviews.llvm.org/D62445#1613268
-// UNSUPPORTED: darwin
+// UNSUPPORTED: target={{.*darwin.*}}
 
 // RUN: %clang_analyze_cc1 -verify %s \
 // RUN:   -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext \
diff --git a/clang/test/CodeGen/c-strings.c b/clang/test/CodeGen/c-strings.c
index 6873941..9e1ac0f 100644
--- a/clang/test/CodeGen/c-strings.c
+++ b/clang/test/CodeGen/c-strings.c
@@ -1,4 +1,4 @@
-// XFAIL: aarch64-pc-windows-msvc
+// XFAIL: taraget=aarch64-pc-windows-msvc
 // RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK --check-prefix=ITANIUM
 // RUN: %clang_cc1 -triple %ms_abi_triple -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK --check-prefix=MSABI
 
@@ -21,7 +21,7 @@
 // fails the check for "@f3.x = ... align [ALIGN]", since ALIGN is derived
 // from the alignment of a single i8, which is still 1.
 
-// XFAIL: csky
+// XFAIL: target=csky{{.*}}
 // CSKY aligns arrays of size 4+ bytes to a 32-bit boundary, which
 // fails the check for "@f2.x = ... align [ALIGN]", since ALIGN is derived
 // from the alignment of a single i8, which is still 1.
diff --git a/clang/test/PCH/leakfiles.test b/clang/test/PCH/leakfiles.test
index 90b2790..dc4047a 100644
--- a/clang/test/PCH/leakfiles.test
+++ b/clang/test/PCH/leakfiles.test
@@ -3,7 +3,7 @@
 //
 // This test requires bash loops and ulimit.
 // REQUIRES: shell
-// UNSUPPORTED: win32
+// UNSUPPORTED: target={{.*win32.*}}
 //
 // Set up source files. lib/lib.h includes lots of lib*.h files in that dir.
 // client.c includes lib/lib.h, and also the individual files directly.
-- 
2.7.4