Try to refactor OSS fuzzers into static libraries.

This commit is contained in:
Nick Mathewson 2017-01-09 12:25:28 -05:00
parent 99d4faf6d3
commit 92679d90d5

View File

@ -178,79 +178,62 @@ endif
if OSS_FUZZ_ENABLED if OSS_FUZZ_ENABLED
OSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ OSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
OSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS) OSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS)
OSS_FUZZ_LDFLAG = $(FUZZING_LDFLAG)
OSS_FUZZ_LIBS = $(FUZZING_LIBS) -lFuzzingEngine -lstdc++
src_test_fuzz_oss_fuzz_consensus_SOURCES = \ src_test_fuzz_oss_fuzz_consensus_a_SOURCES = \
$(src_test_fuzz_fuzz_consensus_SOURCES) $(src_test_fuzz_fuzz_consensus_SOURCES)
src_test_fuzz_oss_fuzz_consensus_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_consensus_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_consensus_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_consensus_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_consensus_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_consensus_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_descriptor_SOURCES = \ src_test_fuzz_oss_fuzz_descriptor_a_SOURCES = \
$(src_test_fuzz_fuzz_descriptor_SOURCES) $(src_test_fuzz_fuzz_descriptor_SOURCES)
src_test_fuzz_oss_fuzz_descriptor_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_descriptor_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_descriptor_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_descriptor_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_descriptor_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_descriptor_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_extrainfo_SOURCES = \ src_test_fuzz_oss_fuzz_extrainfo_a_SOURCES = \
$(src_test_fuzz_fuzz_extrainfo_SOURCES) $(src_test_fuzz_fuzz_extrainfo_SOURCES)
src_test_fuzz_oss_fuzz_extrainfo_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_extrainfo_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_extrainfo_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_extrainfo_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_extrainfo_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_extrainfo_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_http_SOURCES = \ src_test_fuzz_oss_fuzz_http_a_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES) $(src_test_fuzz_fuzz_http_SOURCES)
src_test_fuzz_oss_fuzz_http_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_http_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_http_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_http_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_http_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_http_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_hsdescv2_SOURCES = \ src_test_fuzz_oss_fuzz_hsdescv2_a_SOURCES = \
$(src_test_fuzz_fuzz_hsdescv2_SOURCES) $(src_test_fuzz_fuzz_hsdescv2_SOURCES)
src_test_fuzz_oss_fuzz_hsdescv2_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_hsdescv2_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_hsdescv2_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_hsdescv2_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_hsdescv2_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_hsdescv2_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_iptsv2_SOURCES = \ src_test_fuzz_oss_fuzz_iptsv2_a_SOURCES = \
$(src_test_fuzz_fuzz_iptsv2_SOURCES) $(src_test_fuzz_fuzz_iptsv2_SOURCES)
src_test_fuzz_oss_fuzz_iptsv2_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_iptsv2_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_iptsv2_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_iptsv2_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_iptsv2_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_iptsv2_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_microdesc_SOURCES = \ src_test_fuzz_oss_fuzz_microdesc_a_SOURCES = \
$(src_test_fuzz_fuzz_microdesc_SOURCES) $(src_test_fuzz_fuzz_microdesc_SOURCES)
src_test_fuzz_oss_fuzz_microdesc_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_microdesc_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_microdesc_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_microdesc_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_microdesc_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_microdesc_LDADD = $(OSS_FUZZ_LIBS)
src_test_fuzz_oss_fuzz_vrs_SOURCES = \ src_test_fuzz_oss_fuzz_vrs_a_a_SOURCES = \
$(src_test_fuzz_fuzz_vrs_SOURCES) $(src_test_fuzz_fuzz_vrs_SOURCES)
src_test_fuzz_oss_fuzz_vrs_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS) src_test_fuzz_oss_fuzz_vrs_a_a_CPPFLAGS = $(OSS_FUZZ_CPPFLAGS)
src_test_fuzz_oss_fuzz_vrs_CFLAGS = $(OSS_FUZZ_CFLAGS) src_test_fuzz_oss_fuzz_vrs_a_a_CFLAGS = $(OSS_FUZZ_CFLAGS)
src_test_fuzz_oss_fuzz_vrs_LDFLAGS = $(OSS_FUZZ_LDFLAG)
src_test_fuzz_oss_fuzz_vrs_LDADD = $(OSS_FUZZ_LIBS)
OSS_FUZZ_FUZZERS = \ OSS_FUZZ_FUZZERS = \
src/test/fuzz/oss-fuzz-consensus \ src/test/fuzz/oss-fuzz-consensus.a \
src/test/fuzz/oss-fuzz-descriptor \ src/test/fuzz/oss-fuzz-descriptor.a \
src/test/fuzz/oss-fuzz-extrainfo \ src/test/fuzz/oss-fuzz-extrainfo.a \
src/test/fuzz/oss-fuzz-http \ src/test/fuzz/oss-fuzz-http.a \
src/test/fuzz/oss-fuzz-hsdescv2 \ src/test/fuzz/oss-fuzz-hsdescv2.a \
src/test/fuzz/oss-fuzz-iptsv2 \ src/test/fuzz/oss-fuzz-iptsv2.a \
src/test/fuzz/oss-fuzz-microdesc \ src/test/fuzz/oss-fuzz-microdesc.a \
src/test/fuzz/oss-fuzz-vrs src/test/fuzz/oss-fuzz-vrs.a
else else
OSS_FUZZ_FUZZERS OSS_FUZZ_FUZZERS =
endif endif
noinst_PROGRAMS += $(FUZZERS) $(LIBFUZZER_FUZZERS) $(OSS_FUZZ_FUZZERS) noinst_PROGRAMS += $(FUZZERS) $(LIBFUZZER_FUZZERS)
noinst_LIBRARIES += $(OSS_FUZZ_FUZZERS)
oss-fuzz-fuzzers: $(OSS_FUZZ_FUZZERS) oss-fuzz-fuzzers: $(OSS_FUZZ_FUZZERS)
fuzzers: $(FUZZERS) $(LIBFUZZER_FUZZERS) fuzzers: $(FUZZERS) $(LIBFUZZER_FUZZERS)