summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Fuzzer
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/Fuzzer')
-rw-r--r--llvm/lib/Fuzzer/test/CMakeLists.txt3
-rw-r--r--llvm/lib/Fuzzer/test/caller-callee.test2
-rw-r--r--llvm/lib/Fuzzer/test/fuzzer.test5
-rw-r--r--llvm/lib/Fuzzer/test/no-coverage/CMakeLists.txt2
-rw-r--r--llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt2
-rw-r--r--llvm/lib/Fuzzer/test/uninstrumented/CMakeLists.txt2
6 files changed, 6 insertions, 10 deletions
diff --git a/llvm/lib/Fuzzer/test/CMakeLists.txt b/llvm/lib/Fuzzer/test/CMakeLists.txt
index a664e944585..fddb1517f1e 100644
--- a/llvm/lib/Fuzzer/test/CMakeLists.txt
+++ b/llvm/lib/Fuzzer/test/CMakeLists.txt
@@ -25,8 +25,7 @@ foreach (VARNAME ${variables_to_filter})
endforeach()
# Enable the coverage instrumentation (it is disabled for the Fuzzer lib).
-#set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=8bit-counters -fsanitize-coverage=edge,indirect-calls,trace-cmp,trace-div,trace-gep,trace-pc-guard -g")
-set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fsanitize-coverage=edge,indirect-calls,trace-cmp,trace-div,trace-gep -g")
+set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp,trace-div,trace-gep -g")
# add_libfuzzer_test(<name>
# SOURCES source0.cpp [source1.cpp ...]
diff --git a/llvm/lib/Fuzzer/test/caller-callee.test b/llvm/lib/Fuzzer/test/caller-callee.test
new file mode 100644
index 00000000000..cbe631c01aa
--- /dev/null
+++ b/llvm/lib/Fuzzer/test/caller-callee.test
@@ -0,0 +1,2 @@
+CHECK: BINGO
+RUN: not LLVMFuzzer-CallerCalleeTest -use_value_profile=1 -cross_over=0 -max_len=6 -seed=1 -max_total_time=15 2>&1 | FileCheck %s
diff --git a/llvm/lib/Fuzzer/test/fuzzer.test b/llvm/lib/Fuzzer/test/fuzzer.test
index ccca3d33fc5..0fc9ff9aebe 100644
--- a/llvm/lib/Fuzzer/test/fuzzer.test
+++ b/llvm/lib/Fuzzer/test/fuzzer.test
@@ -32,11 +32,6 @@ COUNTERS: NEW {{.*}} {{bits:|ft:}} {{[1-9]*}}
COUNTERS: NEW {{.*}} {{bits:|ft:}} {{[1-9]*}}
COUNTERS: BINGO
-RUN: not LLVMFuzzer-CallerCalleeTest -use_value_profile=1 -cross_over=0 -max_len=6 -seed=1 -max_total_time=15 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-CallerCalleeTest-TracePC -use_value_profile=1 -cross_over=0 -max_len=6 -seed=1 -max_total_time=15 2>&1 | FileCheck %s
-# This one is flaky, may actually find the goal even w/o use_indir_calls.
-# LLVMFuzzer-CallerCalleeTest -use_indir_calls=0 -cross_over=0 -max_len=6 -seed=1 -runs=1000000 2>&1 | FileCheck %s --check-prefix=Done1000000
-
RUN: not LLVMFuzzer-UninstrumentedTest-Uninstrumented 2>&1 | FileCheck %s --check-prefix=UNINSTRUMENTED
UNINSTRUMENTED: ERROR: __sanitizer_set_death_callback is not defined. Exiting.
diff --git a/llvm/lib/Fuzzer/test/no-coverage/CMakeLists.txt b/llvm/lib/Fuzzer/test/no-coverage/CMakeLists.txt
index e0e68499ef0..d2f6f438ad7 100644
--- a/llvm/lib/Fuzzer/test/no-coverage/CMakeLists.txt
+++ b/llvm/lib/Fuzzer/test/no-coverage/CMakeLists.txt
@@ -2,7 +2,7 @@
# but have coverage rt in the binary.
set(CMAKE_CXX_FLAGS
- "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
+ "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard")
set(NoCoverageTests
UninstrumentedTest
diff --git a/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt b/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt
index d5caa188ed4..91becaef15b 100644
--- a/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt
+++ b/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt
@@ -1,7 +1,7 @@
# These tests are not instrumented with coverage.
set(CMAKE_CXX_FLAGS
- "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=8bit-counters -fsanitize-coverage=trace-pc-guard")
+ "${LIBFUZZER_FLAGS_BASE} ")
set(TracePCTests
SimpleTest
diff --git a/llvm/lib/Fuzzer/test/uninstrumented/CMakeLists.txt b/llvm/lib/Fuzzer/test/uninstrumented/CMakeLists.txt
index 06e48985e7e..29b66e6e586 100644
--- a/llvm/lib/Fuzzer/test/uninstrumented/CMakeLists.txt
+++ b/llvm/lib/Fuzzer/test/uninstrumented/CMakeLists.txt
@@ -2,7 +2,7 @@
# have coverage rt in the binary.
set(CMAKE_CXX_FLAGS
- "${LIBFUZZER_FLAGS_BASE} -fno-sanitize=all -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
+ "${LIBFUZZER_FLAGS_BASE} -fno-sanitize=all -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters,trace-pc-guard")
set(UninstrumentedTests
UninstrumentedTest
OpenPOWER on IntegriCloud