[compiler-rt] 17f804e - [hwasan] Convert tests to check 'target=...'

[Paul Robinson via llvm-commits]

Author: Paul Robinson
Date: 2022-12-21T05:41:41-08:00
New Revision: 17f804ef4b8fff0e8860ce656f2c4dfbf16d56c6

URL: https://github.com/llvm/llvm-project/commit/17f804ef4b8fff0e8860ce656f2c4dfbf16d56c6
DIFF: https://github.com/llvm/llvm-project/commit/17f804ef4b8fff0e8860ce656f2c4dfbf16d56c6.diff

LOG: [hwasan] Convert tests to check 'target=...'

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

Added: 
    

Modified: 
    compiler-rt/test/hwasan/TestCases/deep-recursion.c
    compiler-rt/test/hwasan/TestCases/stack-history-length.c
    compiler-rt/test/hwasan/TestCases/stack-oob.c
    compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c
    compiler-rt/test/hwasan/TestCases/stack-uar.c
    compiler-rt/test/hwasan/TestCases/stack-uas.c
    compiler-rt/test/msan/allocator_mapping.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/hwasan/TestCases/deep-recursion.c b/compiler-rt/test/hwasan/TestCases/deep-recursion.c
index 373c986c8b290..733bf9afcbe20 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 <stdlib.h>
 // 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 2434299a84a41..e6b1405088942 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 <stdlib.h>
 

diff  --git a/compiler-rt/test/hwasan/TestCases/stack-oob.c b/compiler-rt/test/hwasan/TestCases/stack-oob.c
index b745fb071ad19..7006866c8fa92 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 <stdlib.h>
 #include <sanitizer/hwasan_interface.h>

diff  --git a/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c b/compiler-rt/test/hwasan/TestCases/stack-uar-dynamic.c
index 57426f1e66132..b06568e12eba7 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 3663eac5d2685..b04f914f8c889 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 6edacd7587cb9..3f0dcd9d47fc3 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 533128f9a0f41..e7a12da489152 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 <assert.h>
 #include <stdio.h>