Change fuzzer binaries and solutions to prefix with fuzzer_.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e7e353590e30e2b2271c030fad688af47721786..104ff163c31abcd49ffca0f0e786ed9ec5b6e6ed 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1280,11 +1280,11 @@ if(ZLIB_ENABLE_TESTS)
         set(FUZZERS checksum compress example_small example_large example_flush example_dict minigzip)
         file(GLOB ALL_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
         foreach(FUZZER ${FUZZERS})
-            add_executable(${FUZZER}_fuzzer test/fuzz/${FUZZER}_fuzzer.c test/fuzz/standalone_fuzz_target_runner.c)
-            configure_test_executable(${FUZZER}_fuzzer)
-            target_link_libraries(${FUZZER}_fuzzer zlib)
-            set(FUZZER_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${FUZZER}_fuzzer> ${ALL_SRC_FILES})
-            add_test(NAME ${FUZZER}_fuzzer COMMAND ${FUZZER_COMMAND})
+            add_executable(fuzzer_${FUZZER} test/fuzz/fuzzer_${FUZZER}.c test/fuzz/standalone_fuzz_target_runner.c)
+            configure_test_executable(fuzzer_${FUZZER})
+            target_link_libraries(fuzzer_${FUZZER} zlib)
+            set(FUZZER_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fuzzer_${FUZZER}> ${ALL_SRC_FILES})
+            add_test(NAME fuzzer_${FUZZER} COMMAND ${FUZZER_COMMAND})
         endforeach()
     endif()
 

diff --git a/Makefile.in b/Makefile.in
index 9f64dabab893394c6ed77e552c2139da6cecfda7..8f89d0a9c59252cdaedb0de965ef2c13bee26d2f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,7 +191,7 @@ else
 endif
 
 ifeq (1,$(WITH_FUZZERS))
-fuzzers: checksum_fuzzer$(EXE) compress_fuzzer$(EXE) example_small_fuzzer$(EXE) example_large_fuzzer$(EXE) example_flush_fuzzer$(EXE) example_dict_fuzzer$(EXE) minigzip_fuzzer$(EXE)
+fuzzers: fuzzer_checksum$(EXE) fuzzer_compress$(EXE) fuzzer_example_small$(EXE) fuzzer_example_large$(EXE) fuzzer_example_flush$(EXE) fuzzer_example_dict$(EXE) fuzzer_minigzip$(EXE)
 else
 fuzzers:
 endif
@@ -199,34 +199,34 @@ endif
 # The standalone fuzz target runner.
 standalone_fuzz_target_runner.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-checksum_fuzzer.o:
+fuzzer_checksum.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-compress_fuzzer.o:
+fuzzer_compress.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-example_small_fuzzer.o:
+fuzzer_example_small.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-example_large_fuzzer.o:
+fuzzer_example_large.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-example_flush_fuzzer.o:
+fuzzer_example_flush.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-example_dict_fuzzer.o:
+fuzzer_example_dict.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-minigzip_fuzzer.o:
+fuzzer_minigzip.o:
        $(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $<
-checksum_fuzzer$(EXE): checksum_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) checksum_fuzzer.o $(STATICLIB) -lpthread
-compress_fuzzer$(EXE): compress_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) compress_fuzzer.o $(STATICLIB) -lpthread
-example_small_fuzzer$(EXE): example_small_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) example_small_fuzzer.o $(STATICLIB) -lpthread
-example_large_fuzzer$(EXE): example_large_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) example_large_fuzzer.o $(STATICLIB) -lpthread
-example_flush_fuzzer$(EXE): example_flush_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) example_flush_fuzzer.o $(STATICLIB) -lpthread
-example_dict_fuzzer$(EXE): example_dict_fuzzer.o standalone_fuzz_target_runner.o $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) example_dict_fuzzer.o $(STATICLIB) -lpthread
-minigzip_fuzzer$(EXE): minigzip_fuzzer.o standalone_fuzz_target_runner.o $(OBJG) $(STATICLIB)
-       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) minigzip_fuzzer.o $(OBJG) $(STATICLIB) -lpthread
+fuzzer_checksum$(EXE): fuzzer_checksum.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_checksum.o $(STATICLIB) -lpthread
+fuzzer_compress$(EXE): fuzzer_compress.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_compress.o $(STATICLIB) -lpthread
+fuzzer_example_small$(EXE): fuzzer_example_small.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_example_small.o $(STATICLIB) -lpthread
+fuzzer_example_large$(EXE): fuzzer_example_large.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_example_large.o $(STATICLIB) -lpthread
+fuzzer_example_flush$(EXE): fuzzer_example_flush.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_example_flush.o $(STATICLIB) -lpthread
+fuzzer_example_dict$(EXE): fuzzer_example_dict.o standalone_fuzz_target_runner.o $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_example_dict.o $(STATICLIB) -lpthread
+fuzzer_minigzip$(EXE): fuzzer_minigzip.o standalone_fuzz_target_runner.o $(OBJG) $(STATICLIB)
+       $(CC) $(LDFLAGS) -o $@ $(LIB_FUZZING_ENGINE) fuzzer_minigzip.o $(OBJG) $(STATICLIB) -lpthread
 
 infcover.o: $(SRCDIR)/test/infcover.c zlib$(SUFFIX).h zconf$(SUFFIX).h zlib_name_mangling$(SUFFIX).h
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/infcover.c
@@ -439,8 +439,8 @@ clean:
        rm -f *.o *.lo *~ \
           adler32_test$(EXE) crc32_test$(EXE) example$(EXE) minigzip$(EXE) \
           adler32_testsh$(EXE) crc32_testsh$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
-          checksum_fuzzer$(EXE) compress_fuzzer$(EXE) example_small_fuzzer$(EXE) example_large_fuzzer$(EXE) \
-          example_flush_fuzzer$(EXE) example_dict_fuzzer$(EXE) minigzip_fuzzer$(EXE) \
+          fuzzer_checksum$(EXE) fuzzer_compress$(EXE) fuzzer_example_small$(EXE) fuzzer_example_large$(EXE) \
+          fuzzer_example_flush$(EXE) fuzzer_example_dict$(EXE) fuzzer_minigzip$(EXE) \
           infcover makefixed$(EXE) maketrees$(EXE) makecrct$(EXE) \
           $(STATICLIB) $(IMPORTLIB) $(SHAREDLIB) $(SHAREDLIBV) $(SHAREDLIBM) \
           foo.gz so_locations \

diff --git a/test/Makefile.in b/test/Makefile.in
index 6a075d362e4a4d95caad195b334c3891c8eaafd9..ce6d06a35bd1ffe9132c3c778676a157e2ded890 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -35,13 +35,13 @@ else
 fuzzer:
  else
 fuzzer:
-       @${QEMU_RUN} ../checksum_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../compress_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../example_small_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../example_large_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../example_flush_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../example_dict_fuzzer$(EXE) $(ALL_SRC_FILES) && \
-       ${QEMU_RUN} ../minigzip_fuzzer$(EXE) $(ALL_SRC_FILES)
+       @${QEMU_RUN} ../fuzzer_checksumr$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_compress$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_example_small$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_example_large$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_example_flush$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_example_dict$(EXE) $(ALL_SRC_FILES) && \
+       ${QEMU_RUN} ../fuzzer_minigzip$(EXE) $(ALL_SRC_FILES)
  endif
 endif
 

diff --git a/test/fuzz/checksum_fuzzer.c b/test/fuzz/fuzzer_checksum.c
similarity index 100%
rename from test/fuzz/checksum_fuzzer.c
rename to test/fuzz/fuzzer_checksum.c

diff --git a/test/fuzz/compress_fuzzer.c b/test/fuzz/fuzzer_compress.c
similarity index 100%
rename from test/fuzz/compress_fuzzer.c
rename to test/fuzz/fuzzer_compress.c

diff --git a/test/fuzz/example_dict_fuzzer.c b/test/fuzz/fuzzer_example_dict.c
similarity index 100%
rename from test/fuzz/example_dict_fuzzer.c
rename to test/fuzz/fuzzer_example_dict.c

diff --git a/test/fuzz/example_flush_fuzzer.c b/test/fuzz/fuzzer_example_flush.c
similarity index 100%
rename from test/fuzz/example_flush_fuzzer.c
rename to test/fuzz/fuzzer_example_flush.c

diff --git a/test/fuzz/example_large_fuzzer.c b/test/fuzz/fuzzer_example_large.c
similarity index 100%
rename from test/fuzz/example_large_fuzzer.c
rename to test/fuzz/fuzzer_example_large.c

diff --git a/test/fuzz/example_small_fuzzer.c b/test/fuzz/fuzzer_example_small.c
similarity index 100%
rename from test/fuzz/example_small_fuzzer.c
rename to test/fuzz/fuzzer_example_small.c

diff --git a/test/fuzz/minigzip_fuzzer.c b/test/fuzz/fuzzer_minigzip.c
similarity index 100%
rename from test/fuzz/minigzip_fuzzer.c
rename to test/fuzz/fuzzer_minigzip.c