[compiler-rt] 8a86860 - [fuzzer] Convert tests to check 'target=...'
Paul Robinson via llvm-commits
llvm-commits at lists.llvm.org
Fri Dec 16 11:42:02 PST 2022
Author: Paul Robinson
Date: 2022-12-16T11:41:53-08:00
New Revision: 8a86860207f0d5c794a2b8c0b384001710e5d036
URL: https://github.com/llvm/llvm-project/commit/8a86860207f0d5c794a2b8c0b384001710e5d036
DIFF: https://github.com/llvm/llvm-project/commit/8a86860207f0d5c794a2b8c0b384001710e5d036.diff
LOG: [fuzzer] Convert tests to check 'target=...'
Part of the project to eliminate special handling for triples in lit
expressions.
Added:
Modified:
compiler-rt/test/fuzzer/acquire-crash-state.test
compiler-rt/test/fuzzer/afl-driver-stderr.test
compiler-rt/test/fuzzer/bcmp.test
compiler-rt/test/fuzzer/caller-callee.test
compiler-rt/test/fuzzer/compressed.test
compiler-rt/test/fuzzer/counters.test
compiler-rt/test/fuzzer/coverage.test
compiler-rt/test/fuzzer/custom-allocator.test
compiler-rt/test/fuzzer/cxxstring.test
compiler-rt/test/fuzzer/disable-leaks.test
compiler-rt/test/fuzzer/dso.test
compiler-rt/test/fuzzer/equivalence-signals.test
compiler-rt/test/fuzzer/equivalence.test
compiler-rt/test/fuzzer/exit_on_src_pos.test
compiler-rt/test/fuzzer/focus-function.test
compiler-rt/test/fuzzer/fork-sigusr.test
compiler-rt/test/fuzzer/fork-ubsan.test
compiler-rt/test/fuzzer/fork.test
compiler-rt/test/fuzzer/fork_corpus_groups.test
compiler-rt/test/fuzzer/full-coverage.test
compiler-rt/test/fuzzer/fuzzer-oom.test
compiler-rt/test/fuzzer/fuzzer-printcovpcs.test
compiler-rt/test/fuzzer/gc-sections.test
compiler-rt/test/fuzzer/memcmp.test
compiler-rt/test/fuzzer/memcmp64.test
compiler-rt/test/fuzzer/merge-posix.test
compiler-rt/test/fuzzer/merge-sigusr.test
compiler-rt/test/fuzzer/minimize_two_crashes.test
compiler-rt/test/fuzzer/msan-custom-mutator.test
compiler-rt/test/fuzzer/msan-param-unpoison.test
compiler-rt/test/fuzzer/msan.test
compiler-rt/test/fuzzer/noasan-bcmp.test
compiler-rt/test/fuzzer/noasan-memcmp.test
compiler-rt/test/fuzzer/noasan-memcmp64.test
compiler-rt/test/fuzzer/noasan-strcmp.test
compiler-rt/test/fuzzer/noasan-strncmp.test
compiler-rt/test/fuzzer/noasan-strstr.test
compiler-rt/test/fuzzer/print-func.test
compiler-rt/test/fuzzer/recommended-dictionary.test
compiler-rt/test/fuzzer/sigint.test
compiler-rt/test/fuzzer/sigusr.test
compiler-rt/test/fuzzer/strcmp.test
compiler-rt/test/fuzzer/strncmp.test
compiler-rt/test/fuzzer/strstr.test
compiler-rt/test/fuzzer/trace-malloc-threaded.test
compiler-rt/test/fuzzer/ulimit.test
compiler-rt/test/fuzzer/value-profile-cmp2.test
compiler-rt/test/fuzzer/value-profile-div.test
compiler-rt/test/fuzzer/value-profile-mem.test
compiler-rt/test/fuzzer/value-profile-strcmp.test
compiler-rt/test/fuzzer/value-profile-strncmp.test
compiler-rt/test/fuzzer/value-profile-switch.test
Removed:
################################################################################
diff --git a/compiler-rt/test/fuzzer/acquire-crash-state.test b/compiler-rt/test/fuzzer/acquire-crash-state.test
index 0f30ccc73ea98..c707ec1bd9ec5 100644
--- a/compiler-rt/test/fuzzer/acquire-crash-state.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/afl-driver-stderr.test b/compiler-rt/test/fuzzer/afl-driver-stderr.test
index 5e3007e5427ee..84f21d4da5cbd 100644
--- a/compiler-rt/test/fuzzer/afl-driver-stderr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/bcmp.test b/compiler-rt/test/fuzzer/bcmp.test
index 8c1e532b16aba..403ade4bfc1ae 100644
--- a/compiler-rt/test/fuzzer/bcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/caller-callee.test b/compiler-rt/test/fuzzer/caller-callee.test
index 679e4a6f65a41..1877c1705276c 100644
--- a/compiler-rt/test/fuzzer/caller-callee.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/compressed.test b/compiler-rt/test/fuzzer/compressed.test
index d3326f49d8d57..d13d5ebd145ff 100644
--- a/compiler-rt/test/fuzzer/compressed.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/counters.test b/compiler-rt/test/fuzzer/counters.test
index 27acaa4cdd67d..9add7fc68b22a 100644
--- a/compiler-rt/test/fuzzer/counters.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/coverage.test b/compiler-rt/test/fuzzer/coverage.test
index b9218c21ec765..ccbc3dc7cc2bf 100644
--- a/compiler-rt/test/fuzzer/coverage.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/custom-allocator.test b/compiler-rt/test/fuzzer/custom-allocator.test
index a1f41c5f867dc..a0bdceb15184b 100644
--- a/compiler-rt/test/fuzzer/custom-allocator.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/cxxstring.test b/compiler-rt/test/fuzzer/cxxstring.test
index c8969d763e0ad..7eb26dd7f1cbe 100644
--- a/compiler-rt/test/fuzzer/cxxstring.test
+++ b/compiler-rt/test/fuzzer/cxxstring.test
@@ -1,4 +1,4 @@
-UNSUPPORTED: freebsd
+UNSUPPORTED: target={{.*freebsd.*}}
RUN: %cpp_compiler %S/CxxStringEqTest.cpp -o %t-CxxStringEqTest
diff --git a/compiler-rt/test/fuzzer/disable-leaks.test b/compiler-rt/test/fuzzer/disable-leaks.test
index 1c65884e32130..534db7fa24043 100644
--- a/compiler-rt/test/fuzzer/disable-leaks.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/dso.test b/compiler-rt/test/fuzzer/dso.test
index 60ef8a6ac8323..b3027205cd1c7 100644
--- a/compiler-rt/test/fuzzer/dso.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/equivalence-signals.test b/compiler-rt/test/fuzzer/equivalence-signals.test
index 1da66f1474f17..1a0837bfb1149 100644
--- a/compiler-rt/test/fuzzer/equivalence-signals.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/equivalence.test b/compiler-rt/test/fuzzer/equivalence.test
index 2438811f28098..2d0bb76bd937a 100644
--- a/compiler-rt/test/fuzzer/equivalence.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/exit_on_src_pos.test b/compiler-rt/test/fuzzer/exit_on_src_pos.test
index 881d314439852..9aaf035fc7c83 100644
--- a/compiler-rt/test/fuzzer/exit_on_src_pos.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/focus-function.test b/compiler-rt/test/fuzzer/focus-function.test
index 2485c6cc0f62f..ec4a03c95a635 100644
--- a/compiler-rt/test/fuzzer/focus-function.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fork-sigusr.test b/compiler-rt/test/fuzzer/fork-sigusr.test
index ebe3435416a90..4f796171fbd11 100644
--- a/compiler-rt/test/fuzzer/fork-sigusr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fork-ubsan.test b/compiler-rt/test/fuzzer/fork-ubsan.test
index 16be90de292a6..2d68b72fe6bbc 100644
--- a/compiler-rt/test/fuzzer/fork-ubsan.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fork.test b/compiler-rt/test/fuzzer/fork.test
index 6e76fe7f2b06a..5c176871e100e 100644
--- a/compiler-rt/test/fuzzer/fork.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fork_corpus_groups.test b/compiler-rt/test/fuzzer/fork_corpus_groups.test
index 1ccc8e4490b09..d4d3fae259550 100644
--- a/compiler-rt/test/fuzzer/fork_corpus_groups.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/full-coverage.test b/compiler-rt/test/fuzzer/full-coverage.test
index e161e5b3754a7..f189962399b0f 100644
--- a/compiler-rt/test/fuzzer/full-coverage.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fuzzer-oom.test b/compiler-rt/test/fuzzer/fuzzer-oom.test
index 9bc451c50ee97..ca6ca73121870 100644
--- a/compiler-rt/test/fuzzer/fuzzer-oom.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/fuzzer-printcovpcs.test b/compiler-rt/test/fuzzer/fuzzer-printcovpcs.test
index 751dc9f224f09..a7e3006c75858 100644
--- a/compiler-rt/test/fuzzer/fuzzer-printcovpcs.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/gc-sections.test b/compiler-rt/test/fuzzer/gc-sections.test
index 415b80c291bdc..1b00b98304cb2 100644
--- a/compiler-rt/test/fuzzer/gc-sections.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/memcmp.test b/compiler-rt/test/fuzzer/memcmp.test
index 5657cab41dfc2..94c30a8d2fb87 100644
--- a/compiler-rt/test/fuzzer/memcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/memcmp64.test b/compiler-rt/test/fuzzer/memcmp64.test
index 24d14bf73bbf4..3fb64be748802 100644
--- a/compiler-rt/test/fuzzer/memcmp64.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/merge-posix.test b/compiler-rt/test/fuzzer/merge-posix.test
index 883b7b6be97b5..9fece647ca60b 100644
--- a/compiler-rt/test/fuzzer/merge-posix.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/merge-sigusr.test b/compiler-rt/test/fuzzer/merge-sigusr.test
index 5b5e4e3fbd4b3..762ae0d106d28 100644
--- a/compiler-rt/test/fuzzer/merge-sigusr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/minimize_two_crashes.test b/compiler-rt/test/fuzzer/minimize_two_crashes.test
index 67c62d71515bd..d0fd769166866 100644
--- a/compiler-rt/test/fuzzer/minimize_two_crashes.test
+++ b/compiler-rt/test/fuzzer/minimize_two_crashes.test
@@ -2,7 +2,7 @@
XFAIL: tvos && !tvossim
# Test that the minimizer stops when it sees a
diff erent 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
diff --git a/compiler-rt/test/fuzzer/msan-custom-mutator.test b/compiler-rt/test/fuzzer/msan-custom-mutator.test
index 568077ad6c317..6e65d7218a9dd 100644
--- a/compiler-rt/test/fuzzer/msan-custom-mutator.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/msan-param-unpoison.test b/compiler-rt/test/fuzzer/msan-param-unpoison.test
index 699ea96cce6a9..dadb0c27b95a7 100644
--- a/compiler-rt/test/fuzzer/msan-param-unpoison.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/msan.test b/compiler-rt/test/fuzzer/msan.test
index 23ea6da4ea5f9..08e450bc4b155 100644
--- a/compiler-rt/test/fuzzer/msan.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-bcmp.test b/compiler-rt/test/fuzzer/noasan-bcmp.test
index a3dd17bf6e2b8..f80632aef92bd 100644
--- a/compiler-rt/test/fuzzer/noasan-bcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-memcmp.test b/compiler-rt/test/fuzzer/noasan-memcmp.test
index c5ce2fff8c9fa..b668a4dc0f651 100644
--- a/compiler-rt/test/fuzzer/noasan-memcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-memcmp64.test b/compiler-rt/test/fuzzer/noasan-memcmp64.test
index 496ee386193e9..f77f6490879c9 100644
--- a/compiler-rt/test/fuzzer/noasan-memcmp64.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-strcmp.test b/compiler-rt/test/fuzzer/noasan-strcmp.test
index c264dec6bea2f..0d82d6b2846f8 100644
--- a/compiler-rt/test/fuzzer/noasan-strcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-strncmp.test b/compiler-rt/test/fuzzer/noasan-strncmp.test
index dd0f254609221..4cb3e11573a11 100644
--- a/compiler-rt/test/fuzzer/noasan-strncmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/noasan-strstr.test b/compiler-rt/test/fuzzer/noasan-strstr.test
index e969170bfac98..5c25de1111509 100644
--- a/compiler-rt/test/fuzzer/noasan-strstr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/print-func.test b/compiler-rt/test/fuzzer/print-func.test
index c74da218282e2..7072c2a5e3cdf 100644
--- a/compiler-rt/test/fuzzer/print-func.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/recommended-dictionary.test b/compiler-rt/test/fuzzer/recommended-dictionary.test
index e1d58c96fa205..d54bf795df4f3 100644
--- a/compiler-rt/test/fuzzer/recommended-dictionary.test
+++ b/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. ######
diff --git a/compiler-rt/test/fuzzer/sigint.test b/compiler-rt/test/fuzzer/sigint.test
index 65bfdeb98e353..0e239c3ce5385 100644
--- a/compiler-rt/test/fuzzer/sigint.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/sigusr.test b/compiler-rt/test/fuzzer/sigusr.test
index fa477a76eea1e..c3d7adf8ea99b 100644
--- a/compiler-rt/test/fuzzer/sigusr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/strcmp.test b/compiler-rt/test/fuzzer/strcmp.test
index 14c22635fb162..b41613d683883 100644
--- a/compiler-rt/test/fuzzer/strcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/strncmp.test b/compiler-rt/test/fuzzer/strncmp.test
index fb820b7d20e87..91f38a35b9c9c 100644
--- a/compiler-rt/test/fuzzer/strncmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/strstr.test b/compiler-rt/test/fuzzer/strstr.test
index 60261e3f1ff3d..48c696d8f8681 100644
--- a/compiler-rt/test/fuzzer/strstr.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/trace-malloc-threaded.test b/compiler-rt/test/fuzzer/trace-malloc-threaded.test
index a2dfb38091a3e..c6b6f39180f55 100644
--- a/compiler-rt/test/fuzzer/trace-malloc-threaded.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/ulimit.test b/compiler-rt/test/fuzzer/ulimit.test
index 7cf4c0a68866b..223f2ac9bb6e2 100644
--- a/compiler-rt/test/fuzzer/ulimit.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-cmp2.test b/compiler-rt/test/fuzzer/value-profile-cmp2.test
index 3e4705b45b3b6..5cf91cf2524d2 100644
--- a/compiler-rt/test/fuzzer/value-profile-cmp2.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-div.test b/compiler-rt/test/fuzzer/value-profile-div.test
index 015471c65ba29..40ff37455dfee 100644
--- a/compiler-rt/test/fuzzer/value-profile-div.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-mem.test b/compiler-rt/test/fuzzer/value-profile-mem.test
index dce7d8411b4bc..e6f3c4fece27e 100644
--- a/compiler-rt/test/fuzzer/value-profile-mem.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-strcmp.test b/compiler-rt/test/fuzzer/value-profile-strcmp.test
index 9b7a244d73c28..9a768ce7603b4 100644
--- a/compiler-rt/test/fuzzer/value-profile-strcmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-strncmp.test b/compiler-rt/test/fuzzer/value-profile-strncmp.test
index 98488df0a552e..249e9f4d9bd12 100644
--- a/compiler-rt/test/fuzzer/value-profile-strncmp.test
+++ b/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
diff --git a/compiler-rt/test/fuzzer/value-profile-switch.test b/compiler-rt/test/fuzzer/value-profile-switch.test
index 35409ef2bb4a7..87ead6c190e14 100644
--- a/compiler-rt/test/fuzzer/value-profile-switch.test
+++ b/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
More information about the llvm-commits
mailing list