[compiler-rt] 975fa72 - [sanitizer-common] Convert tests to check 'target=...'
Paul Robinson via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 19 11:01:17 PST 2022
Author: Paul Robinson
Date: 2022-12-19T11:01:09-08:00
New Revision: 975fa725063fe33aba02164a53c4ef66662e68d8
URL: https://github.com/llvm/llvm-project/commit/975fa725063fe33aba02164a53c4ef66662e68d8
DIFF: https://github.com/llvm/llvm-project/commit/975fa725063fe33aba02164a53c4ef66662e68d8.diff
LOG: [sanitizer-common] Convert tests to check 'target=...'
Part of the project to eliminate special handling for triples in lit
expressions.
Added:
Modified:
compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
compiler-rt/test/sanitizer_common/TestCases/Linux/resize_tls_dynamic.cpp
compiler-rt/test/sanitizer_common/TestCases/Linux/setuid.c
compiler-rt/test/sanitizer_common/TestCases/Linux/signal_send.cpp
compiler-rt/test/sanitizer_common/TestCases/Linux/signal_trap_handler.cpp
compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
compiler-rt/test/sanitizer_common/TestCases/Linux/symbolize_stack_fp.cpp
compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c
compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/getrandom.c
compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/print-module-map.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
compiler-rt/test/sanitizer_common/TestCases/external_symbolizer_path.cpp
compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
compiler-rt/test/sanitizer_common/TestCases/max_allocation_size.cpp
compiler-rt/test/sanitizer_common/TestCases/printf-ldbl.c
compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
compiler-rt/test/sanitizer_common/TestCases/scanf-ldbl.c
compiler-rt/test/sanitizer_common/TestCases/strcasestr.c
Removed:
################################################################################
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
index f0e556e9b24c3..b082191cb0092 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
@@ -6,7 +6,7 @@
// REQUIRES: stable-runtime
-// UNSUPPORTED: android, freebsd, netbsd, ubsan
+// UNSUPPORTED: android, target={{.*(freebsd|netbsd).*}}, ubsan
// Checks that pvalloc overflows are caught. If the allocator is allowed to
// return null, the errno should be set to ENOMEM.
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/resize_tls_dynamic.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/resize_tls_dynamic.cpp
index 5ebf98c955c9f..5cb8fe374bf58 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/resize_tls_dynamic.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/resize_tls_dynamic.cpp
@@ -9,7 +9,7 @@
// UNSUPPORTED: lsan, ubsan, android
// FIXME: Investigate
-// UNSUPPORTED: powerpc64
+// UNSUPPORTED: target=powerpc64{{.*}}
#include <string.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/setuid.c b/compiler-rt/test/sanitizer_common/TestCases/Linux/setuid.c
index 9674ed34138a1..ca85a14ab1b4e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/setuid.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/setuid.c
@@ -4,7 +4,7 @@
// the unsupported flag.
// https://llvm.org/bugs/show_bug.cgi?id=25799
//
-// UNSUPPORTED: powerpc64-unknown-linux-gnu
+// UNSUPPORTED: target=powerpc64-unknown-linux-gnu{{.*}}
#include <pthread.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_send.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_send.cpp
index f5dcc4bc3208c..035a5a8df77ae 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_send.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_send.cpp
@@ -1,7 +1,7 @@
// RUN: %clangxx -std=c++11 -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
// sigandset is glibc specific.
-// UNSUPPORTED: android, freebsd, netbsd
+// UNSUPPORTED: android, target={{.*(freebsd|netbsd).*}}
#include <assert.h>
#include <signal.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_trap_handler.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_trap_handler.cpp
index efc43c6ee31e6..51b5d30223ced 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_trap_handler.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_trap_handler.cpp
@@ -1,7 +1,7 @@
// RUN: %clangxx -O1 %s -o %t && %env_tool_opts=handle_sigtrap=1 %run %t 2>&1 | FileCheck %s
// __builtin_debugtrap() does not raise SIGTRAP on these platforms.
-// UNSUPPORTED: s390
+// UNSUPPORTED: target=s390{{.*}}
#include <assert.h>
#include <signal.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
index 5c239f2055e45..b5c749d478072 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
@@ -14,7 +14,7 @@
// XFAIL: ubsan
// THUMB starts background thead only for Asan.
-// XFAIL: thumb && !asan
+// XFAIL: target={{.*thumb.*}} && !asan
// https://github.com/google/sanitizers/issues/981
// UNSUPPORTED: android-26
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/symbolize_stack_fp.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/symbolize_stack_fp.cpp
index 8d9dad1c9ac90..c581055e0b1b0 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/symbolize_stack_fp.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/symbolize_stack_fp.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: android
/// Fast unwinder does not work with Thumb code
-// UNSUPPORTED: thumb
+// UNSUPPORTED: target={{.*thumb.*}}
/// No .eh_frame && -g => .debug_frame
// SEC: .debug_frame
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
index 025ca9052e6fa..4639a92b86da5 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t
-// XFAIL: netbsd && msan
+// XFAIL: target={{.*netbsd.*}} && msan
#include <stdlib.h>
#include <unistd.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
index 826f61a762cc5..5e95cbc331424 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, solaris
+// UNSUPPORTED: target={{.*(linux|solaris).*}}
#include <cstdlib>
#include <ctime>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
index 1630003e519bf..deedbba76cdeb 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
@@ -10,7 +10,7 @@
// REQUIRES: stable-runtime
-// XFAIL: netbsd && !asan
+// XFAIL: target={{.*netbsd.*}} && !asan
volatile int *null = 0;
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
index 1495f7d9d518d..8a34de5e31061 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
@@ -1,5 +1,5 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
-// UNSUPPORTED: linux, solaris
+// UNSUPPORTED: target={{.*(linux|solaris).*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
index ae10a766271e1..5f0968e2be55b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
@@ -1,5 +1,5 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
-// UNSUPPORTED: linux, solaris
+// UNSUPPORTED: target={{.*(linux|solaris).*}}
#include <sys/cdefs.h>
#include <sys/stat.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
index 1db9099b57a2b..68b4ad5b887d1 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
@@ -1,7 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t
-// UNSUPPORTED: linux
// fgetln is BSD-only.
-// UNSUPPORTED: solaris
+// UNSUPPORTED: target={{.*(linux|solaris).*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
index 26f3b849f4c43..5de879d2392e2 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <assert.h>
#include <inttypes.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
index 79c41f7de6742..795bc11a39e60 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <sys/param.h>
#include <sys/types.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
index 7d3192488ec5c..052cc19dff286 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
@@ -11,7 +11,7 @@
// CHECK-NEXT: READ CALLED; len={{[0-9]*}}
// CHECK-NEXT: READ: test
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c b/compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c
index 7cd605e3249f8..e382cb5f714ed 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c
@@ -1,6 +1,6 @@
// RUN: %clang -pthread %s -Wl,-as-needed -o %t && %run %t
//
-// UNSUPPORTED: darwin, solaris
+// UNSUPPORTED: darwin, target={{.*solaris.*}}
#include <time.h>
#include <unistd.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
index 687a7a7d4879a..8df8b5726148b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <assert.h>
#include <errno.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
index 26c065d4dd1fc..25d6310df2fb1 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, solaris
+// UNSUPPORTED: target={{.*(linux|solaris).*}}
#include <sys/types.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
index d8cef5597552c..f46447fa388b8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
@@ -3,7 +3,7 @@
// REQUIRES: stable-runtime
// XFAIL: android && asan
// No libutil.
-// UNSUPPORTED: solaris
+// UNSUPPORTED: target={{.*solaris.*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getrandom.c b/compiler-rt/test/sanitizer_common/TestCases/Posix/getrandom.c
index 1d15b881ed111..3e4ef7524c94c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getrandom.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getrandom.c
@@ -1,5 +1,5 @@
// RUN: %clang -O2 %s -o %t && %run %t
-// UNSUPPORTED: android, netbsd, darwin, solaris
+// UNSUPPORTED: android, darwin, target={{.*(netbsd|solaris).*}}
//
#include <sys/types.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
index 2addb9bd47508..45d3f256378fc 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
@@ -4,7 +4,7 @@
// RUN: %clangxx -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
// REQUIRES: stable-runtime
-// XFAIL: powerpc64, s390x
+// XFAIL: target={{(powerpc64|s390x).*}}
volatile int *null = 0;
volatile int a;
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
index 531b4d294b8fb..9b94b8d0237ce 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
@@ -4,7 +4,7 @@
// RUN: %clangxx -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
// REQUIRES: stable-runtime
-// XFAIL: powerpc64, s390x
+// XFAIL: target={{(powerpc64|s390x).*}}
volatile int *null = 0;
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
index b8123542fb8f5..791e9378adaea 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <langinfo.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/print-module-map.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/print-module-map.cpp
index 776ecd4be11d3..c0e80d9debab7 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/print-module-map.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/print-module-map.cpp
@@ -16,7 +16,7 @@
// XFAIL: tsan
// FIXME: Add linux support.
-// XFAIL: msan && linux
+// XFAIL: msan && target={{.*linux.*}}
// FIXME: Add lsan support.
// XFAIL: lsan
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
index 63408dee2b637..59d9480b562f9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: darwin, solaris
+// UNSUPPORTED: darwin, target={{.*solaris.*}}
#include <assert.h>
#include <regex.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
index e60e8b875e01b..b7bcdf15499d2 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
-// UNSUPPORTED: solaris
+// UNSUPPORTED: target={{.*solaris.*}}
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
index 4da70c7888f68..6c14add8c4078 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#include <assert.h>
#include <errno.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
index bdabada76aa77..b026f12f35fca 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t
-// UNSUPPORTED: linux
+// UNSUPPORTED: target={{.*linux.*}}
#include <stdio.h>
#include <stdlib.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
index 83053911d965a..d7a5d1d3a51e9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t
-// UNSUPPORTED: linux
+// UNSUPPORTED: target={{.*linux.*}}
#include <stdio.h>
#include <stdlib.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
index 22346b2e111ce..a4f013096c596 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: darwin, target={{.*(linux|solaris).*}}
#define _OPENBSD_SOURCE
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
index 2cb8764f34b0e..38c34259bbae0 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, solaris
+// UNSUPPORTED: linux, target={{.*solaris.*}}
#include <sys/param.h>
#include <sys/types.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
index 15f1bc949023b..0d31082f92b25 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
//
-// UNSUPPORTED: linux, solaris, darwin
+// UNSUPPORTED: target={{.*(linux|solaris).*}}, darwin
#include <ctype.h>
#include <err.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp b/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
index f5d99174910f5..e9d4601a8ac8f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
@@ -36,7 +36,7 @@
// RUN: | FileCheck %s --check-prefix=CHECK-NULL
// TODO(alekseyshl): win32 is disabled due to failing errno tests, fix it there.
-// UNSUPPORTED: ubsan, windows-msvc
+// UNSUPPORTED: ubsan, target={{.*windows-msvc.*}}
#include <assert.h>
#include <errno.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp b/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
index 369f08407584d..be1a1d1e43a53 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
@@ -9,10 +9,10 @@
// UNSUPPORTED: ubsan
// FIXME: Fails for unknown reason.
-// UNSUPPORTED: s390x
+// UNSUPPORTED: target=s390x{{.*}}
// Similar to D114934, something is broken with background thread on THUMB and Asan.
-// XFAIL: thumb && asan
+// XFAIL: target={{.*thumb.*}} && asan
#include <sanitizer/common_interface_defs.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/external_symbolizer_path.cpp b/compiler-rt/test/sanitizer_common/TestCases/external_symbolizer_path.cpp
index 8754e5a721460..9416da2940be3 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/external_symbolizer_path.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/external_symbolizer_path.cpp
@@ -25,7 +25,7 @@
// UNSUPPORTED: ios, android
// FIXME: Figure out why this fails on certain buildbots and re-enable.
-// UNSUPPORTED: linux
+// UNSUPPORTED: target={{.*linux.*}}
#include <sanitizer/common_interface_defs.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
index 4df5ba24d3c61..26831ab55916b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
@@ -12,10 +12,10 @@
//
// Ubsan does not intercept pthread_create.
// XFAIL: ubsan
-// UNSUPPORTED: freebsd, solaris, darwin
+// UNSUPPORTED: target={{.*(freebsd|solaris).*}}, darwin
// THUMB starts background thead only for Asan.
-// XFAIL: thumb && !asan
+// XFAIL: target={{.*thumb.*}} && !asan
#include <string.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp b/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
index 7579ca2c3f982..160e4e1bd1754 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
@@ -1,7 +1,7 @@
// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
// Malloc/free hooks are not supported on Windows.
-// XFAIL: windows-msvc
+// XFAIL: target={{.*windows-msvc.*}}
// XFAIL: ubsan
#include <stdlib.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/max_allocation_size.cpp b/compiler-rt/test/sanitizer_common/TestCases/max_allocation_size.cpp
index fc9bc3a044812..44f2935434e89 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/max_allocation_size.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/max_allocation_size.cpp
@@ -41,7 +41,7 @@
// RUN: %run %t strndup 2>&1 | FileCheck %s --check-prefix=CHECK-NULL
// win32 is disabled due to failing errno tests.
-// UNSUPPORTED: ubsan, windows-msvc
+// UNSUPPORTED: ubsan, target={{.*windows-msvc.*}}
#include <assert.h>
#include <errno.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/printf-ldbl.c b/compiler-rt/test/sanitizer_common/TestCases/printf-ldbl.c
index 25686ad01162b..bb333a334b12f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/printf-ldbl.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/printf-ldbl.c
@@ -1,7 +1,7 @@
// RUN: %clang %s -o %t && %run %t 2>&1
// Issue #41838
-// XFAIL: sparc-target-arch && solaris
+// XFAIL: target={{sparc.*solaris.*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp b/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
index 742ae72c41b41..1363e12bdea91 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
@@ -1,7 +1,7 @@
// RUN: %clangxx -O0 %s -o %t && %run %t
// pthread_mutexattr_setpshared and pthread_mutexattr_getpshared unavailable
-// UNSUPPORTED: netbsd
+// UNSUPPORTED: target={{.*netbsd.*}}
#include <assert.h>
#include <pthread.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
index 3346d62830adc..9805fbd44eebd 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
@@ -1,7 +1,7 @@
// Tests trace pc guard coverage collection.
// REQUIRES: has_sancovcc
-// UNSUPPORTED: ubsan,powerpc64,s390x,thumb
+// UNSUPPORTED: ubsan,target={{(powerpc64|s390x).*}},target={{.*thumb.*}}
// XFAIL: tsan,darwin
// XFAIL: android && asan
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
index 69a6dda694e67..c72f8bb88cb2b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
@@ -1,7 +1,7 @@
// Tests trace pc guard coverage collection.
// REQUIRES: has_sancovcc
-// UNSUPPORTED: ubsan,i386-darwin,powerpc64,s390x,thumb
+// UNSUPPORTED: ubsan,i386-darwin,target={{(powerpc64|s390x).*}},target={{.*thumb.*}}
// XFAIL: tsan
// XFAIL: android && asan
diff --git a/compiler-rt/test/sanitizer_common/TestCases/scanf-ldbl.c b/compiler-rt/test/sanitizer_common/TestCases/scanf-ldbl.c
index 1e488a9162d16..0a6a81e8dd265 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/scanf-ldbl.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/scanf-ldbl.c
@@ -1,7 +1,7 @@
// RUN: %clang %s -o %t && %run %t 2>&1
// Issue #41838
-// XFAIL: sparc-target-arch && solaris
+// XFAIL: target={{sparc.*solaris.*}}
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/strcasestr.c b/compiler-rt/test/sanitizer_common/TestCases/strcasestr.c
index 04f8d744b7ab1..8831977569b84 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/strcasestr.c
+++ b/compiler-rt/test/sanitizer_common/TestCases/strcasestr.c
@@ -1,7 +1,7 @@
// RUN: %clang %s -o %t && %run %t 2>&1
// There's no interceptor for strcasestr on Windows
-// XFAIL: windows-msvc
+// XFAIL: target={{.*windows-msvc.*}}
#define _GNU_SOURCE
#include <assert.h>
More information about the llvm-commits
mailing list