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

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

compiler-rt/test/fuzzer/acquire-crash-state.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: arm
+UNSUPPORTED: target=arm{{.*}}
 RUN: %cpp_compiler %S/AcquireCrashStateTest.cpp -o %t
 RUN: %run %t 2>&1 | FileCheck %s
 CHECK-NOT: fuzz target exited

compiler-rt/test/fuzzer/afl-driver-stderr.test

@@ -1,5 +1,5 @@
 # AFL doesn't work on Windows. No reason to test the driver.
-UNSUPPORTED: freebsd, windows
+UNSUPPORTED: target={{.*(freebsd|windows).*}}
 XFAIL: ios
 RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest
 

compiler-rt/test/fuzzer/bcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 RUN: %cpp_compiler -DMEMCMP=bcmp %S/MemcmpTest.cpp -o %t
 RUN: not %run %t -seed=1 -runs=10000000 2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/caller-callee.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/CallerCalleeTest.cpp -o %t-CallerCalleeTest
 CHECK: BINGO
 RUN: not %run %t-CallerCalleeTest          -use_value_profile=1 -cross_over=0 -seed=1 -runs=10000000 2>&1 | FileCheck %s

compiler-rt/test/fuzzer/compressed.test

@@ -2,7 +2,7 @@ REQUIRES: linux
 REQUIRES: zlib
 # zlib is "supported" on i386 even when only for x86_64, explicitly make i386
 # unsupported by this test.
-UNSUPPORTED: i386, arm
+UNSUPPORTED: target={{(i386|arm).*}}
 # Custom mutator should find this bug, w/o custom -- no chance.
 RUN: %cpp_compiler %S/CompressedTest.cpp -o %t-CompressedTestCustom -DCUSTOM_MUTATOR -lz
 RUN: %cpp_compiler %S/CompressedTest.cpp -o %t-CompressedTestPlain -lz

compiler-rt/test/fuzzer/counters.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: aarch64, ios, arm
+UNSUPPORTED: ios, target={{(aarch64|arm).*}}
 RUN: %cpp_compiler %S/CounterTest.cpp -o %t-CounterTest
 RUN: not %run %t-CounterTest  -max_len=6 -seed=1 -timeout=15 2>&1 | FileCheck %s --check-prefix=COUNTERS
 

compiler-rt/test/fuzzer/coverage.test

@@ -1,7 +1,7 @@
 # FIXME: Disabled on Windows because -fPIC cannot be used to compile for Windows.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 # FIXME: CreatePCArray() emits PLT stub addresses for entry blocks, which are ignored by TracePC::PrintCoverage().
-UNSUPPORTED: s390x
+UNSUPPORTED: target=s390x{{.*}}
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable  %S/NullDerefTest.cpp -o %t-NullDerefTest
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable %S/DSO1.cpp -fPIC %ld_flags_rpath_so1 -O0 -shared -o %dynamiclib1
 RUN: %cpp_compiler -mllvm -use-unknown-locations=Disable %S/DSO2.cpp -fPIC %ld_flags_rpath_so2 -O0 -shared -o %dynamiclib2

compiler-rt/test/fuzzer/custom-allocator.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 RUN: %cpp_compiler -fno-sanitize=address -fno-builtin %S/CustomAllocator.cpp %S/EmptyTest.cpp -o %t-NoAsanCustomAllocatorTest
 RUN: %run %t-NoAsanCustomAllocatorTest -runs=1 2>&1 | FileCheck %s
 

compiler-rt/test/fuzzer/cxxstring.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 
 RUN: %cpp_compiler %S/CxxStringEqTest.cpp -o %t-CxxStringEqTest
 

compiler-rt/test/fuzzer/disable-leaks.test

@@ -1,5 +1,5 @@
 REQUIRES: lsan
-UNSUPPORTED: aarch64
+UNSUPPORTED: target=aarch64{{.*}}
 RUN: %cpp_compiler %S/AccumulateAllocationsTest.cpp -o %t-AccumulateAllocationsTest
 RUN: %run %t-AccumulateAllocationsTest -detect_leaks=1 -runs=100000 2>&1 | FileCheck %s --check-prefix=ACCUMULATE_ALLOCS
 ACCUMULATE_ALLOCS: INFO: libFuzzer disabled leak detection after every mutation

compiler-rt/test/fuzzer/dso.test

@@ -1,5 +1,5 @@
 # FIXME: Disabled on Windows because -fPIC cannot be used to compile for Windows.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 RUN: %cpp_compiler %S/DSO1.cpp -fPIC %ld_flags_rpath_so1 -shared -o %dynamiclib1
 RUN: %cpp_compiler %S/DSO2.cpp -fPIC %ld_flags_rpath_so2 -shared -o %dynamiclib2
 RUN: %cpp_compiler %S/DSOTestMain.cpp %S/DSOTestExtra.cpp %ld_flags_rpath_exe1 %ld_flags_rpath_exe2 -o %t-DSOTest

compiler-rt/test/fuzzer/equivalence-signals.test

@@ -2,7 +2,7 @@ REQUIRES: this-test-is-deprecated
 # Run EquivalenceATest against itself with a small timeout
 # to stress the signal handling and ensure that shmem doesn't mind
 # the signals.
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 
 # The test is not supported on Darwin
 UNSUPPORTED: darwin

compiler-rt/test/fuzzer/equivalence.test

@@ -1,5 +1,5 @@
 REQUIRES: this-test-is-deprecated
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/EquivalenceATest.cpp -o %t-EquivalenceATest
 RUN: %cpp_compiler %S/EquivalenceBTest.cpp -o %t-EquivalenceBTest
 

compiler-rt/test/fuzzer/exit_on_src_pos.test

@@ -5,7 +5,7 @@
 # in expansion of %t cause the compiler to overwrite .lib and .exp files.
 
 # Test does not complete on Armv7 Thumb build bot
-UNSUPPORTED: thumb
+UNSUPPORTED: target={{.*thumb.*}}
 
 RUN: %cpp_compiler -O0 %S/SimpleTest.cpp -o %t-SimpleTest.exe -mllvm -use-unknown-locations=Disable
 RUN: %cpp_compiler -O0 %S/ShrinkControlFlowTest.cpp -o %t-ShrinkControlFlowTest.exe

compiler-rt/test/fuzzer/focus-function.test

@@ -2,7 +2,7 @@
 #
 # TODO: don't require linux.
 # REQUIRES: linux
-UNSUPPORTED: aarch64
+UNSUPPORTED: target=aarch64{{.*}}
 
 RUN: %cpp_compiler %S/OnlySomeBytesTest.cpp -o %t-exe
 

compiler-rt/test/fuzzer/fork-sigusr.test

@@ -1,6 +1,6 @@
 # Check that libFuzzer honors SIGUSR1/SIGUSR2
 # Disabled on Windows which does not have SIGUSR1/SIGUSR2.
-UNSUPPORTED: darwin, windows, aarch64
+UNSUPPORTED: darwin, target={{.*windows.*}}, target=aarch64{{.*}}
 RUN: rm -rf %t
 RUN: mkdir -p %t
 RUN: %cpp_compiler %S/SleepOneSecondTest.cpp -o %t/ForkSIGUSR

compiler-rt/test/fuzzer/fork-ubsan.test

@@ -1,4 +1,4 @@
-# UNSUPPORTED: darwin, freebsd, aarch64
+# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}
 # Tests how the fork mode works together with ubsan.
 RUN: %cpp_compiler %S/IntegerOverflowTest.cpp -o %t-IntegerOverflowTest -fsanitize=signed-integer-overflow -fno-sanitize-recover=signed-integer-overflow
 RUN: not %run %t-IntegerOverflowTest -fork=1 -ignore_crashes=1  -runs=10000 2>&1 | FileCheck %s --check-prefix=UBSAN_FORK

compiler-rt/test/fuzzer/fork.test

@@ -1,4 +1,4 @@
-# UNSUPPORTED: darwin, freebsd, aarch64
+# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}
 BINGO: BINGO
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: not %run %t-SimpleTest -fork=1 2>&1 | FileCheck %s --check-prefix=BINGO

compiler-rt/test/fuzzer/fork_corpus_groups.test

@@ -1,4 +1,4 @@
-# UNSUPPORTED: darwin, freebsd, aarch64
+# UNSUPPORTED: darwin, target={{.*freebsd.*}}, target=aarch64{{.*}}
 BINGO: BINGO
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: not %run %t-SimpleTest -fork=1 -fork_corpus_groups=1 2>&1 | FileCheck %s --check-prefix=BINGO

compiler-rt/test/fuzzer/full-coverage.test

@@ -1,7 +1,7 @@
 # FIXME: Disabled on Windows because -fPIC cannot be used to compile for Windows.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 # FIXME: See coverage.test.  Using UNSUPPORTED here due to random failures.
-UNSUPPORTED: s390x
+UNSUPPORTED: target=s390x{{.*}}
 RUN: %cpp_compiler %S/DSO1.cpp -fPIC %ld_flags_rpath_so1 -O0 -shared -o %dynamiclib1
 RUN: %cpp_compiler %S/DSO2.cpp -fPIC %ld_flags_rpath_so2 -O0 -shared -o %dynamiclib2
 RUN: %cpp_compiler %S/DSOTestMain.cpp %S/DSOTestExtra.cpp %ld_flags_rpath_exe1 %ld_flags_rpath_exe2 -o %t-DSOTest

compiler-rt/test/fuzzer/fuzzer-oom.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: aarch64, ios
+UNSUPPORTED: target=aarch64{{.*}}, ios
 # Tests break on windows unless exe extension is used (because there are periods
 # in expansion of %t, the string after the period is interpreted as the file
 # extension, so each compilation will clobber the previous one's lib and exp

compiler-rt/test/fuzzer/fuzzer-printcovpcs.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: aarch64
+UNSUPPORTED: target=aarch64{{.*}}
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: not %run %t-SimpleTest -print_pcs=1 -seed=1 2>&1 | FileCheck %s --check-prefix=PCS
 PCS-NOT: NEW_PC

compiler-rt/test/fuzzer/gc-sections.test

@@ -1,6 +1,6 @@
 REQUIRES: linux, lld-available
 # LLD isn't pruning functions as we expect it to with ASAN on i386.
-UNSUPPORTED: i386
+UNSUPPORTED: target=i386{{.*}}
 
 No gc-sections:
 RUN: %cpp_compiler %S/GcSectionsTest.cpp -o %t

compiler-rt/test/fuzzer/memcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/MemcmpTest.cpp -o %t-MemcmpTest
 RUN: not %run %t-MemcmpTest               -seed=1 -runs=10000000   2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/memcmp64.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/Memcmp64BytesTest.cpp -o %t-Memcmp64BytesTest
 RUN: not %run %t-Memcmp64BytesTest        -seed=1 -runs=1000000   2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/merge-posix.test

@@ -1,5 +1,5 @@
 XFAIL: ios
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 RUN: %cpp_compiler %S/FullCoverageSetTest.cpp -o %t-FullCoverageSetTest
 
 RUN: rm -rf  %tmp/T1 %tmp/T2

compiler-rt/test/fuzzer/merge-sigusr.test

@@ -1,7 +1,7 @@
 # Check that libFuzzer honors SIGUSR1/SIGUSR2
 # FIXME: Disabled on Windows for now because of reliance on posix only features
 # (eg: export, "&", pkill).
-UNSUPPORTED: darwin, windows
+UNSUPPORTED: darwin, target={{.*windows.*}}
 RUN: rm -rf %t
 RUN: mkdir -p %t
 RUN: %cpp_compiler %S/SleepOneSecondTest.cpp -o %t/LFSIGUSR

compiler-rt/test/fuzzer/minimize_two_crashes.test

@@ -2,7 +2,7 @@
 XFAIL: tvos && !tvossim
 
 # Test that the minimizer stops when it sees a different bug.
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 
 # TODO: Find out why test fails on Darwin with -O2.
 RUN: %cpp_compiler -O0 %S/TwoDifferentBugsTest.cpp -o %t-TwoDifferentBugsTest

compiler-rt/test/fuzzer/msan-custom-mutator.test

@@ -1,5 +1,5 @@
 REQUIRES: msan
-UNSUPPORTED: arm
+UNSUPPORTED: target=arm{{.*}}
 RUN: %msan_compiler %S/MsanCustomMutator.cpp -o %t
 RUN: %run %t -seed=1 -runs=1000 2>&1 | FileCheck %s
 

compiler-rt/test/fuzzer/msan-param-unpoison.test

@@ -1,5 +1,5 @@
 REQUIRES: msan
-UNSUPPORTED: arm
+UNSUPPORTED: target=arm{{.*}}
 RUN: %msan_compiler %S/MsanParamUnpoison.cpp -o %t
 RUN: %run %t -seed=1 -runs=1000 2>&1 | FileCheck %s
 

compiler-rt/test/fuzzer/msan.test

@@ -1,5 +1,5 @@
 REQUIRES: msan
-UNSUPPORTED: arm
+UNSUPPORTED: target=arm{{.*}}
 RUN: %msan_compiler %S/SimpleTestStdio.cpp -o %t
 RUN: not %run %t -seed=1 -runs=10000000 2>&1 | FileCheck %s --check-prefix=NO-REPORT
 

compiler-rt/test/fuzzer/noasan-bcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 RUN: %cpp_compiler -fno-sanitize=address -DMEMCMP=bcmp %S/MemcmpTest.cpp -o %t
 RUN: not %run %t -seed=1 -runs=10000000 2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/noasan-memcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 
 RUN: %cpp_compiler -fno-sanitize=address %S/MemcmpTest.cpp -o %t-NoAsanMemcmpTest
 RUN: not %run %t-NoAsanMemcmpTest -seed=1 -runs=10000000   2>&1 | FileCheck %s

compiler-rt/test/fuzzer/noasan-memcmp64.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 
 RUN: %cpp_compiler -fno-sanitize=address %S/Memcmp64BytesTest.cpp -o %t-NoAsanMemcmp64BytesTest
 RUN: not %run %t-NoAsanMemcmp64BytesTest -seed=1 -runs=1000000   2>&1 | FileCheck %s

compiler-rt/test/fuzzer/noasan-strcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 
 RUN: %cpp_compiler -fno-sanitize=address %S/StrcmpTest.cpp -o %t-NoAsanStrcmpTest
 RUN: not %run %t-NoAsanStrcmpTest -seed=1 -runs=2000000   2>&1 | FileCheck %s

compiler-rt/test/fuzzer/noasan-strncmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 
 RUN: %cpp_compiler -fno-sanitize=address %S/StrncmpTest.cpp -o %t-NoAsanStrncmpTest
 RUN: not %run %t-NoAsanStrncmpTest -seed=2 -runs=10000000   2>&1 | FileCheck %s

compiler-rt/test/fuzzer/noasan-strstr.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, freebsd, windows
+UNSUPPORTED: darwin, target={{.*(freebsd|windows).*}}
 
 RUN: %cpp_compiler -fno-sanitize=address %S/StrstrTest.cpp -o %t-NoAsanStrstrTest
 RUN: not %run %t-NoAsanStrstrTest -seed=1 -runs=2000000   2>&1 | FileCheck %s

compiler-rt/test/fuzzer/print-func.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: darwin, aarch64
+UNSUPPORTED: darwin, target=aarch64{{.*}}
 RUN: %cpp_compiler %S/PrintFuncTest.cpp -o %t
 RUN: %run %t -seed=1 -runs=100000 2>&1 | FileCheck %s
 RUN: %run %t -seed=1 -runs=100000 -print_funcs=0 2>&1 | FileCheck %s --check-prefix=NO

compiler-rt/test/fuzzer/recommended-dictionary.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/RepeatedMemcmp.cpp -o %t-RepeatedMemcmp
 RUN: %run %t-RepeatedMemcmp -seed=11 -runs=100000 -max_len=20 2>&1 | FileCheck %s --check-prefix=RECOMMENDED_DICT
 RECOMMENDED_DICT:###### Recommended dictionary. ######

compiler-rt/test/fuzzer/sigint.test

@@ -1,5 +1,5 @@
 REQUIRES: msan
-UNSUPPORTED: arm
+UNSUPPORTED: target=arm{{.*}}
 
 # Check that libFuzzer exits gracefully under SIGINT with MSan.
 RUN: rm -rf %t

compiler-rt/test/fuzzer/sigusr.test

@@ -1,6 +1,6 @@
 # FIXME: Disabled on Windows for now because of reliance on posix only features
 # (eg: export, "&", pkill).
-UNSUPPORTED: darwin, windows
+UNSUPPORTED: darwin, target={{.*windows.*}}
 # Check that libFuzzer honors SIGUSR1/SIGUSR2
 RUN: rm -rf %t
 RUN: mkdir -p %t

compiler-rt/test/fuzzer/strcmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/StrcmpTest.cpp -o %t-StrcmpTest
 RUN: not %run %t-StrcmpTest               -seed=1 -runs=2000000   2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/strncmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/StrncmpTest.cpp -o %t-StrncmpTest
 RUN: not %run %t-StrncmpTest              -seed=2 -runs=10000000   2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/strstr.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 RUN: %cpp_compiler %S/StrstrTest.cpp -o %t-StrstrTest
 RUN: not %run %t-StrstrTest               -seed=1 -runs=2000000   2>&1 | FileCheck %s
 CHECK: BINGO

compiler-rt/test/fuzzer/trace-malloc-threaded.test

@@ -1,7 +1,7 @@
 // FIXME: This test infinite loops on darwin because it crashes
 // printing a stack trace repeatedly
 // FIXME: Disabled on Windows because of a crash (possibly related to above).
-UNSUPPORTED: darwin, aarch64, windows
+UNSUPPORTED: darwin, target=aarch64{{.*}}, target={{.*windows.*}}
 
 RUN: %cpp_compiler %S/TraceMallocThreadedTest.cpp -o \
 RUN:   %t-TraceMallocThreadedTest

compiler-rt/test/fuzzer/ulimit.test

@@ -1,5 +1,5 @@
 # FIXME: Disabled on Windows for now because Windows has no ulimit command.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest
 RUN: ulimit -s 1000
 RUN: not %run %t-SimpleTest

compiler-rt/test/fuzzer/value-profile-cmp2.test

@@ -1,6 +1,6 @@
 UNSUPPORTED: ios
 FIXME: Make libFuzzer handle exits without ASan properly on Windows.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 CHECK: BINGO
 RUN: %cpp_compiler -fno-sanitize=address %S/SimpleHashTest.cpp -o %t-SimpleHashTest
 RUN: not %run %t-SimpleHashTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 -max_len=64 2>&1 | FileCheck %s

compiler-rt/test/fuzzer/value-profile-div.test

@@ -1,5 +1,5 @@
 UNSUPPORTED: ios
-UNSUPPORTED: arm, aarch64
+UNSUPPORTED: target={{(arm|aarch64).*}}
 CHECK: AddressSanitizer: {{FPE|int-divide-by-zero}}
 RUN: %cpp_compiler %S/DivTest.cpp -fsanitize-coverage=trace-div -o %t-DivTest
 RUN: not %run %t-DivTest -seed=1 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s

compiler-rt/test/fuzzer/value-profile-mem.test

@@ -1,5 +1,5 @@
 UNSUPPORTED: ios
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 CHECK: BINGO
 +# Disable trace-cmp so that we test just the memcmp interception
 RUN: %cpp_compiler %S/SingleMemcmpTest.cpp -o %t-SingleMemcmpTest -fno-sanitize-coverage=trace-cmp

compiler-rt/test/fuzzer/value-profile-strcmp.test

@@ -1,5 +1,5 @@
 UNSUPPORTED: ios
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
 CHECK: BINGO
 RUN: %cpp_compiler %S/SingleStrcmpTest.cpp -o %t-SingleStrcmpTest
 RUN: not %run %t-SingleStrcmpTest -seed=1  -use_cmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s

compiler-rt/test/fuzzer/value-profile-strncmp.test

@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd, aarch64
+UNSUPPORTED: target={{.*freebsd.*}}, target=aarch64{{.*}}
 CHECK: BINGO
 RUN: %cpp_compiler %S/SingleStrncmpTest.cpp -o %t-SingleStrncmpTest
 RUN: not %run %t-SingleStrncmpTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s

compiler-rt/test/fuzzer/value-profile-switch.test

@@ -1,5 +1,5 @@
 # Test does not complete on Armv7 Thumb build bot
-UNSUPPORTED: thumb
+UNSUPPORTED: target={{.*thumb.*}}
 UNSUPPORTED: ios
 CHECK: BINGO
 RUN: %cpp_compiler %S/SwitchTest.cpp -o %t-SwitchTest