[xray] Convert tests to check 'target=...'

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

diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cpp b/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cpp
index 757f81a..7125f19 100644 (file)
--- a/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cpp
+++ b/compiler-rt/test/xray/TestCases/Posix/arg1-arg0-logging.cpp
@@ -6,8 +6,8 @@
 // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=arg0-arg1-logging-" %run %t
 //
 // TODO: Support these in ARM and PPC
-// XFAIL: arm || aarch64 || mips
-// UNSUPPORTED: powerpc64le
+// XFAIL: target={{(arm|aarch64|mips).*}}
+// UNSUPPORTED: target=powerpc64le{{.*}}
 
 #include "xray/xray_interface.h"
 #include <cassert>

diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp
index 48544c3..ee957af 100644 (file)
--- a/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp
+++ b/compiler-rt/test/xray/TestCases/Posix/arg1-logger.cpp
@@ -11,9 +11,9 @@
 // RUN: rm -f arg1-logger-*
 //
 // At the time of writing, the ARM trampolines weren't written yet.
-// XFAIL: arm || aarch64 || mips
+// XFAIL: target={{(arm|aarch64|mips).*}}
 // See the mailing list discussion of r296998.
-// UNSUPPORTED: powerpc64le
+// UNSUPPORTED: target=powerpc64le{{.*}}
 
 #include "xray/xray_interface.h"
 

diff --git a/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp b/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp
index d8dd622..938383e 100644 (file)
--- a/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp
+++ b/compiler-rt/test/xray/TestCases/Posix/arg1-logging-implicit-this.cpp
@@ -4,8 +4,8 @@
 // RUN: rm -f log-args-this-*
 // RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=log-args-this-" %run %t
 //
-// XFAIL: FreeBSD || arm || aarch64 || mips
-// UNSUPPORTED: powerpc64le
+// XFAIL: target={{(arm|aarch64|mips).*}}
+// UNSUPPORTED: target=powerpc64le{{.*}}
 #include "xray/xray_interface.h"
 #include <cassert>
 

diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-reinit.cpp b/compiler-rt/test/xray/TestCases/Posix/fdr-reinit.cpp
index faf1372..ad9a9e6 100644 (file)
--- a/compiler-rt/test/xray/TestCases/Posix/fdr-reinit.cpp
+++ b/compiler-rt/test/xray/TestCases/Posix/fdr-reinit.cpp
@@ -1,5 +1,5 @@
 // This will sometimes segfault on the AArch64 and Arm bots
-// UNSUPPORTED: aarch64, arm
+// UNSUPPORTED: target={{(aarch64|arm).*}}
 // RUN: %clangxx_xray -g -std=c++11 %s -o %t
 // RUN: rm xray-log.fdr-reinit* || true
 // RUN: XRAY_OPTIONS="verbosity=1" %run %t

diff --git a/compiler-rt/test/xray/TestCases/Posix/fork_basic_logging.cpp b/compiler-rt/test/xray/TestCases/Posix/fork_basic_logging.cpp
index fd8b781..58f310e 100644 (file)
--- a/compiler-rt/test/xray/TestCases/Posix/fork_basic_logging.cpp
+++ b/compiler-rt/test/xray/TestCases/Posix/fork_basic_logging.cpp
@@ -12,7 +12,7 @@
 // REQUIRES: built-in-llvm-tree
 
 // Not ported.
-// UNSUPPORTED: netbsd
+// UNSUPPORTED: target={{.*netbsd.*}}
 
 #include "xray/xray_log_interface.h"
 #include <stdio.h>