diff options
author | Jonathan Foote <jmfoote@loyola.edu> | 2018-01-03 01:08:15 +0100 |
---|---|---|
committer | Daniel Salzman <daniel.salzman@nic.cz> | 2018-01-03 11:21:41 +0100 |
commit | 32df4b2a0ef3637a25431673762f92f890dc18d2 (patch) | |
tree | 787927f9c9985fbb9024dbe56810775a05de3504 /tests-fuzz | |
parent | mod-synthrecord: mute uninitialized warning (diff) | |
download | knot-32df4b2a0ef3637a25431673762f92f890dc18d2.tar.xz knot-32df4b2a0ef3637a25431673762f92f890dc18d2.zip |
tests-fuzz: remove _libfuzzer from fuzz binaries
Diffstat (limited to 'tests-fuzz')
-rw-r--r-- | tests-fuzz/.gitignore | 4 | ||||
-rw-r--r-- | tests-fuzz/Makefile.am | 28 | ||||
-rwxr-xr-x | tests-fuzz/check/check_fuzzers.test | 4 | ||||
-rw-r--r-- | tests-fuzz/fuzz_packet.c (renamed from tests-fuzz/packet_libfuzzer.c) | 0 | ||||
-rw-r--r-- | tests-fuzz/fuzz_zscanner.c (renamed from tests-fuzz/zscanner_libfuzzer.c) | 0 |
5 files changed, 18 insertions, 18 deletions
diff --git a/tests-fuzz/.gitignore b/tests-fuzz/.gitignore index bd841d057..ecc866b48 100644 --- a/tests-fuzz/.gitignore +++ b/tests-fuzz/.gitignore @@ -6,5 +6,5 @@ /*.trs /*.log -/packet_libfuzzer -/zscanner_libfuzzer +/fuzz_packet +/fuzz_zscanner diff --git a/tests-fuzz/Makefile.am b/tests-fuzz/Makefile.am index c2941b12f..9400f4250 100644 --- a/tests-fuzz/Makefile.am +++ b/tests-fuzz/Makefile.am @@ -2,37 +2,37 @@ AM_CPPFLAGS = \ -include $(top_builddir)/src/config.h \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/dnssec/lib \ - -DCONFIG_DIR='"${config_dir}"' \ - -DSTORAGE_DIR='"${storage_dir}"' \ + -DCONFIG_DIR='"${config_dir}"' \ + -DSTORAGE_DIR='"${storage_dir}"' \ -DRUN_DIR='"${run_dir}"' \ -DSRCDIR=\"$(abs_srcdir)\" FUZZERS = \ - packet_libfuzzer \ - zscanner_libfuzzer + fuzz_packet \ + fuzz_zscanner check_PROGRAMS = $(FUZZERS) -packet_libfuzzer_SOURCES = packet_libfuzzer.c -packet_libfuzzer_LDADD = $(top_builddir)/src/libknot.la +fuzz_packet_SOURCES = fuzz_packet.c +fuzz_packet_LDADD = $(top_builddir)/src/libknot.la -zscanner_libfuzzer_SOURCES = zscanner_libfuzzer.c -zscanner_libfuzzer_LDADD = $(top_builddir)/src/zscanner/libzscanner.la +fuzz_zscanner_SOURCES = fuzz_zscanner.c +fuzz_zscanner_LDADD = $(top_builddir)/src/zscanner/libzscanner.la if OSS_FUZZ # CFLAGS, LDFLAGS, etc. are defined by the oss-fuzz environment; just link # in the fuzzing engine -packet_libfuzzer_LDADD += ${LIB_FUZZING_ENGINE} -lc++ -zscanner_libfuzzer_LDADD += ${LIB_FUZZING_ENGINE} -lc++ +fuzz_packet_LDADD += ${LIB_FUZZING_ENGINE} -lc++ +fuzz_zscanner_LDADD += ${LIB_FUZZING_ENGINE} -lc++ else if SANITIZE_FUZZER -packet_libfuzzer_LDFLAGS = -fsanitize=fuzzer -zscanner_libfuzzer_LDFLAGS = -fsanitize=fuzzer +fuzz_packet_LDFLAGS = -fsanitize=fuzzer +fuzz_zscanner_LDFLAGS = -fsanitize=fuzzer # Ensure that fuzzers execute successfully with a benign input @@ -41,8 +41,8 @@ EXTRA_DIST = check/check_fuzzers.test else -packet_libfuzzer_SOURCES += main.c -zscanner_libfuzzer_SOURCES += main.c +fuzz_packet_SOURCES += main.c +fuzz_zscanner_SOURCES += main.c AM_CPPFLAGS += -DTEST_RUN TESTS = $(FUZZERS) diff --git a/tests-fuzz/check/check_fuzzers.test b/tests-fuzz/check/check_fuzzers.test index 9193eec00..aa46f5f2d 100755 --- a/tests-fuzz/check/check_fuzzers.test +++ b/tests-fuzz/check/check_fuzzers.test @@ -5,5 +5,5 @@ set -e -./packet_libfuzzer check/sample-seed.pkt -./zscanner_libfuzzer check/sample-seed.pkt +./fuzz_packet check/sample-seed.pkt +./fuzz_zscanner check/sample-seed.pkt diff --git a/tests-fuzz/packet_libfuzzer.c b/tests-fuzz/fuzz_packet.c index 0d8dae05c..0d8dae05c 100644 --- a/tests-fuzz/packet_libfuzzer.c +++ b/tests-fuzz/fuzz_packet.c diff --git a/tests-fuzz/zscanner_libfuzzer.c b/tests-fuzz/fuzz_zscanner.c index baccde2cb..baccde2cb 100644 --- a/tests-fuzz/zscanner_libfuzzer.c +++ b/tests-fuzz/fuzz_zscanner.c |