From 17f804ef4b8fff0e8860ce656f2c4dfbf16d56c6 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Wed, 21 Dec 2022 05:41:00 -0800 Subject: [PATCH] [hwasan] Convert tests to check 'target=...' Part of the project to eliminate special handling for triples in lit expressions. --- compiler-rt/test/hwasan/TestCases/deep-recursion.c | 2 +- compiler-rt/test/hwasan/TestCases/stack-history-length.c | 2 +- compiler-rt/test/hwasan/TestCases/stack-oob.c | 2 +- compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c | 2 +- compiler-rt/test/hwasan/TestCases/stack-uar.c | 2 +- compiler-rt/test/hwasan/TestCases/stack-uas.c | 2 +- compiler-rt/test/msan/allocator_mapping.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler-rt/test/hwasan/TestCases/deep-recursion.c b/compiler-rt/test/hwasan/TestCases/deep-recursion.c index 373c986..733bf9a 100644 --- a/compiler-rt/test/hwasan/TestCases/deep-recursion.c +++ b/compiler-rt/test/hwasan/TestCases/deep-recursion.c @@ -17,7 +17,7 @@ // REQUIRES: stable-runtime // Stack histories are currently not recorded on x86. -// XFAIL: x86_64 +// XFAIL: target=x86_64{{.*}} #include // At least -O1 is needed for this function to not have a stack frame on diff --git a/compiler-rt/test/hwasan/TestCases/stack-history-length.c b/compiler-rt/test/hwasan/TestCases/stack-history-length.c index 2434299..e6b1405 100644 --- a/compiler-rt/test/hwasan/TestCases/stack-history-length.c +++ b/compiler-rt/test/hwasan/TestCases/stack-history-length.c @@ -11,7 +11,7 @@ // REQUIRES: stable-runtime // Stack histories are currently not recorded on x86. -// XFAIL: x86_64 +// XFAIL: target=x86_64{{.*}} #include diff --git a/compiler-rt/test/hwasan/TestCases/stack-oob.c b/compiler-rt/test/hwasan/TestCases/stack-oob.c index b745fb0..7006866 100644 --- a/compiler-rt/test/hwasan/TestCases/stack-oob.c +++ b/compiler-rt/test/hwasan/TestCases/stack-oob.c @@ -11,7 +11,7 @@ // Stack short granules are currently not implemented on x86. // RISC-V target doesn't support oldrt -// XFAIL: x86_64, riscv64 +// XFAIL: target={{(x86_64|riscv64).*}} #include #include diff --git a/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c b/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c index 57426f1..b06568e 100644 --- a/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c +++ b/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c @@ -5,7 +5,7 @@ // objects. // Stack histories are currently not recorded on x86. -// XFAIL: x86_64 +// XFAIL: target=x86_64{{.*}} __attribute((noinline)) char *buggy(int b) { diff --git a/compiler-rt/test/hwasan/TestCases/stack-uar.c b/compiler-rt/test/hwasan/TestCases/stack-uar.c index 3663eac..b04f914 100644 --- a/compiler-rt/test/hwasan/TestCases/stack-uar.c +++ b/compiler-rt/test/hwasan/TestCases/stack-uar.c @@ -9,7 +9,7 @@ // REQUIRES: stable-runtime // Stack histories currently are not recorded on x86. -// XFAIL: x86_64 +// XFAIL: target=x86_64{{.*}} void USE(void *x) { // pretend_to_do_something(void *x) __asm__ __volatile__("" : : "r" (x) : "memory"); diff --git a/compiler-rt/test/hwasan/TestCases/stack-uas.c b/compiler-rt/test/hwasan/TestCases/stack-uas.c index 6edacd7..3f0dcd9 100644 --- a/compiler-rt/test/hwasan/TestCases/stack-uas.c +++ b/compiler-rt/test/hwasan/TestCases/stack-uas.c @@ -15,7 +15,7 @@ // REQUIRES: stable-runtime // Stack histories currently are not recorded on x86. -// XFAIL: x86_64 +// XFAIL: target=x86_64{{.*}} void USE(void *x) { // pretend_to_do_something(void *x) __asm__ __volatile__("" diff --git a/compiler-rt/test/msan/allocator_mapping.cpp b/compiler-rt/test/msan/allocator_mapping.cpp index 533128f..e7a12da 100644 --- a/compiler-rt/test/msan/allocator_mapping.cpp +++ b/compiler-rt/test/msan/allocator_mapping.cpp @@ -8,7 +8,7 @@ // This test only makes sense for the 64-bit allocator. The 32-bit allocator // does not have a fixed mapping. Exclude platforms that use the 32-bit // allocator. -// UNSUPPORTED: target-is-mips64,target-is-mips64el,aarch64 +// UNSUPPORTED: target-is-mips64,target-is-mips64el,target=aarch64{{.*}} #include #include -- 2.7.4