diff options
| author | Kostya Serebryany <kcc@google.com> | 2016-09-23 01:58:51 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2016-09-23 01:58:51 +0000 |
| commit | 16a145fd0ff30a2ae0a94de0bfc1e5b4828ddcdd (patch) | |
| tree | 244f248da12a4110426c5ab70b93371085fe9a3e /llvm/lib/Fuzzer/test | |
| parent | e88bbc34c6c13b1ac1a76183afa04b327fc1abc0 (diff) | |
| download | bcm5719-llvm-16a145fd0ff30a2ae0a94de0bfc1e5b4828ddcdd.tar.gz bcm5719-llvm-16a145fd0ff30a2ae0a94de0bfc1e5b4828ddcdd.zip | |
[libFuzzer] fix merging with trace-pc-guard
llvm-svn: 282224
Diffstat (limited to 'llvm/lib/Fuzzer/test')
| -rw-r--r-- | llvm/lib/Fuzzer/test/FuzzerUnittest.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/merge.test | 8 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp index f2ac0e5f458..fdde1d3fbb9 100644 --- a/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp +++ b/llvm/lib/Fuzzer/test/FuzzerUnittest.cpp @@ -583,7 +583,7 @@ TEST(Corpus, Distribution) { size_t N = 10; size_t TriesPerUnit = 1<<20; for (size_t i = 0; i < N; i++) - C.AddToCorpus(Unit{ static_cast<uint8_t>(i) }, nullptr, 0); + C.AddToCorpus(Unit{ static_cast<uint8_t>(i) }); std::vector<size_t> Hist(N); for (size_t i = 0; i < N * TriesPerUnit; i++) { diff --git a/llvm/lib/Fuzzer/test/merge.test b/llvm/lib/Fuzzer/test/merge.test index b3dcc799457..0ef1b6f3069 100644 --- a/llvm/lib/Fuzzer/test/merge.test +++ b/llvm/lib/Fuzzer/test/merge.test @@ -7,7 +7,8 @@ RUN: echo .U.... > %tmp/T1/2 RUN: echo ..Z... > %tmp/T1/3 # T1 has 3 elements, T2 is empty. -RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK1 +RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK1 +RUN: LLVMFuzzer-FullCoverageSetTest-TracePC -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK1 CHECK1: === Minimizing the initial corpus of 3 units CHECK1: === Merge: written 0 units @@ -19,13 +20,14 @@ RUN: echo .U.... > %tmp/T2/b RUN: echo ..Z... > %tmp/T2/c # T1 has 3 elements, T2 has 6 elements, only 3 are new. -RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK2 +RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK2 CHECK2: === Minimizing the initial corpus of 3 units CHECK2: === Merging extra 6 units CHECK2: === Merge: written 3 units # Now, T1 has 6 units and T2 has no new interesting units. -RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK3 +RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK3 +RUN: LLVMFuzzer-FullCoverageSetTest-TracePC -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-prefix=CHECK3 CHECK3: === Minimizing the initial corpus of 6 units CHECK3: === Merge: written 0 units diff --git a/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt b/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt index ea160ccc502..3def7271424 100644 --- a/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt +++ b/llvm/lib/Fuzzer/test/trace-pc/CMakeLists.txt @@ -9,6 +9,7 @@ set(TracePCTests CallerCalleeTest NullDerefTest MinimizeCorpusTest + FullCoverageSetTest ) foreach(Test ${TracePCTests}) |
