From 5d95f2782d1ac2eeb7bd3fb8a6a9c0fe9340437c Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Thu, 10 May 2018 20:37:08 +0000 Subject: [PATCH] [libFuzzer] simplify tests, remove one redundant test; NFC llvm-svn: 332037 --- compiler-rt/test/fuzzer/afl-driver-extra-stats.test | 2 +- compiler-rt/test/fuzzer/afl-driver-stderr.test | 2 +- compiler-rt/test/fuzzer/afl-driver.test | 2 +- compiler-rt/test/fuzzer/inline-8bit-counters.test | 4 ---- compiler-rt/test/fuzzer/trace-pc.test | 2 +- compiler-rt/test/fuzzer/value-profile-load.test | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 compiler-rt/test/fuzzer/inline-8bit-counters.test diff --git a/compiler-rt/test/fuzzer/afl-driver-extra-stats.test b/compiler-rt/test/fuzzer/afl-driver-extra-stats.test index a6de53302002..7595a23557a8 100644 --- a/compiler-rt/test/fuzzer/afl-driver-extra-stats.test +++ b/compiler-rt/test/fuzzer/afl-driver-extra-stats.test @@ -1,4 +1,4 @@ -RUN: %no_fuzzer_cpp_compiler -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest +RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest ; Test that not specifying an extra stats file isn't broken. RUN: unset AFL_DRIVER_EXTRA_STATS_FILENAME diff --git a/compiler-rt/test/fuzzer/afl-driver-stderr.test b/compiler-rt/test/fuzzer/afl-driver-stderr.test index 0ba5e36a7392..a8f42d9920c1 100644 --- a/compiler-rt/test/fuzzer/afl-driver-stderr.test +++ b/compiler-rt/test/fuzzer/afl-driver-stderr.test @@ -1,5 +1,5 @@ UNSUPPORTED: freebsd -RUN: %no_fuzzer_cpp_compiler -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest +RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest ; Test that not specifying a stderr file isn't broken. RUN: unset AFL_DRIVER_STDERR_DUPLICATE_FILENAME diff --git a/compiler-rt/test/fuzzer/afl-driver.test b/compiler-rt/test/fuzzer/afl-driver.test index 32e7d03b43c0..477b574f07e9 100644 --- a/compiler-rt/test/fuzzer/afl-driver.test +++ b/compiler-rt/test/fuzzer/afl-driver.test @@ -1,6 +1,6 @@ REQUIRES: linux -RUN: %no_fuzzer_cpp_compiler -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest +RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest RUN: echo -n "abc" > %t.file3 RUN: echo -n "abcd" > %t.file4 diff --git a/compiler-rt/test/fuzzer/inline-8bit-counters.test b/compiler-rt/test/fuzzer/inline-8bit-counters.test deleted file mode 100644 index 76ae1f537f72..000000000000 --- a/compiler-rt/test/fuzzer/inline-8bit-counters.test +++ /dev/null @@ -1,4 +0,0 @@ -RUN: %cpp_compiler %S/SimpleTest.cpp -fno-sanitize-coverage=trace-pc-guard -fsanitize-coverage=inline-8bit-counters -o %t-SimpleTest-Inline8bitCounters -CHECK: INFO: Loaded 1 modules ({{.*}} inline 8-bit counters) -CHECK: BINGO -RUN: not %t-SimpleTest-Inline8bitCounters -runs=1000000 -seed=1 2>&1 | FileCheck %s diff --git a/compiler-rt/test/fuzzer/trace-pc.test b/compiler-rt/test/fuzzer/trace-pc.test index eaa0cb08afbe..1088532400ee 100644 --- a/compiler-rt/test/fuzzer/trace-pc.test +++ b/compiler-rt/test/fuzzer/trace-pc.test @@ -1,3 +1,3 @@ -RUN: %cpp_compiler %S/SimpleTest.cpp -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard -fsanitize-coverage=trace-pc -o %t-SimpleTest-TracePC +RUN: %cpp_compiler %S/SimpleTest.cpp -fsanitize-coverage=0 -fsanitize-coverage=trace-pc -o %t-SimpleTest-TracePC CHECK: BINGO RUN: not %t-SimpleTest-TracePC -runs=1000000 -seed=1 2>&1 | FileCheck %s diff --git a/compiler-rt/test/fuzzer/value-profile-load.test b/compiler-rt/test/fuzzer/value-profile-load.test index 3bf2a658a5b2..8b4469033818 100644 --- a/compiler-rt/test/fuzzer/value-profile-load.test +++ b/compiler-rt/test/fuzzer/value-profile-load.test @@ -1,3 +1,3 @@ CHECK: AddressSanitizer: global-buffer-overflow -RUN: %cpp_compiler %S/LoadTest.cpp -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-gep,trace-div,trace-cmp -o %t-LoadTest +RUN: %cpp_compiler %S/LoadTest.cpp -fsanitize-coverage=trace-gep -o %t-LoadTest RUN: not %t-LoadTest -seed=2 -use_cmp=0 -use_value_profile=1 -runs=20000000 2>&1 | FileCheck %s