remove _libfuzzer from fuzz binaries

tests-fuzz/Makefile.am

@@ -8,31 +8,31 @@ AM_CPPFLAGS = \
 	-DSRCDIR=\"$(abs_srcdir)\"
 
 FUZZERS = \
-	packet_libfuzzer	\
-	zscanner_libfuzzer
+	packet	\
+	zscanner
 
 check_PROGRAMS = $(FUZZERS)
 
-packet_libfuzzer_SOURCES = packet_libfuzzer.c
-packet_libfuzzer_LDADD = $(top_builddir)/src/libknot.la
+packet_SOURCES = packet_libfuzzer.c
+packet_LDADD = $(top_builddir)/src/libknot.la
 
-zscanner_libfuzzer_SOURCES = zscanner_libfuzzer.c
-zscanner_libfuzzer_LDADD = $(top_builddir)/src/zscanner/libzscanner.la
+zscanner_SOURCES = zscanner_libfuzzer.c
+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++
+packet_LDADD += ${LIB_FUZZING_ENGINE} -lc++
+zscanner_LDADD += ${LIB_FUZZING_ENGINE} -lc++
 
 else
 
 if SANITIZE_FUZZER
 
-packet_libfuzzer_LDFLAGS = -fsanitize=fuzzer
-zscanner_libfuzzer_LDFLAGS = -fsanitize=fuzzer
+packet_LDFLAGS = -fsanitize=fuzzer
+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
+packet_SOURCES += main.c
+zscanner_SOURCES += main.c
 AM_CPPFLAGS += -DTEST_RUN
 TESTS = $(FUZZERS)
 

tests-fuzz/check/check_fuzzers.test

@@ -5,5 +5,5 @@
 
 set -e
 
-./packet_libfuzzer check/sample-seed.pkt
-./zscanner_libfuzzer check/sample-seed.pkt
+./packet check/sample-seed.pkt
+./zscanner check/sample-seed.pkt