[libFuzzer] allow user to specify the merge control file
authorKostya Serebryany <kcc@google.com>
Thu, 9 Nov 2017 01:05:29 +0000 (01:05 +0000)
committerKostya Serebryany <kcc@google.com>
Thu, 9 Nov 2017 01:05:29 +0000 (01:05 +0000)
commit68fdef1f7a20f741026bfc71c99835f213d710ec
treeb101f570a51623e8511ccf232edb0cf8b2243378
parentcf1fee2d59c56af8a8fe8de5715ef0387e16b4e1
[libFuzzer] allow user to specify the merge control file

llvm-svn: 317747
compiler-rt/lib/fuzzer/FuzzerDriver.cpp
compiler-rt/lib/fuzzer/FuzzerFlags.def
compiler-rt/lib/fuzzer/FuzzerInternal.h
compiler-rt/lib/fuzzer/FuzzerMerge.cpp
compiler-rt/test/fuzzer/merge.test