[libFuzzer] allow merge to resume after being preempted
authorKostya Serebryany <kcc@google.com>
Thu, 9 Nov 2017 05:49:28 +0000 (05:49 +0000)
committerKostya Serebryany <kcc@google.com>
Thu, 9 Nov 2017 05:49:28 +0000 (05:49 +0000)
commit3ac31d445313f491e1349b4914c36c57c56671b0
tree1fe4b9cdc244b176f9b162e1c7f64ffda51c02f9
parente5b84ec2a19be202474c72f8d57ff8ac12b1e111
[libFuzzer] allow merge to resume after being preempted

llvm-svn: 317767
compiler-rt/lib/fuzzer/FuzzerFlags.def
compiler-rt/lib/fuzzer/FuzzerMerge.cpp
compiler-rt/test/fuzzer/merge-control-file.test [new file with mode: 0644]