From: Nathan Moinvaziri Date: Tue, 18 Jan 2022 00:30:10 +0000 (-0800) Subject: Rename test binaries with test_ prefix. X-Git-Tag: 2.1.0-beta1~436 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e890a1e313a0d7e1bda4cc3405c1fabe2b11e9;p=thirdparty%2Fzlib-ng.git Rename test binaries with test_ prefix. --- diff --git a/.gitignore b/.gitignore index bf420e572..532aed578 100644 --- a/.gitignore +++ b/.gitignore @@ -13,10 +13,10 @@ *.gcno *.gcov -/adler32_test -/adler32_testsh -/crc32_test -/crc32_testsh +/test_adler32 +/test_adler32sh +/test_crc32 +/test_crc32sh /example /example64 /examplesh diff --git a/CMakeLists.txt b/CMakeLists.txt index 5391fd5c5..454159bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1188,8 +1188,20 @@ if(ZLIB_ENABLE_TESTS) add_test(NAME ${target} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) endmacro() - add_simple_test_executable(adler32_test) - add_simple_test_executable(crc32_test) + file(GLOB TEST_SRCS + LIST_DIRECTORIES false + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/test + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_*.c) + + foreach(TEST_SRC ${TEST_SRCS}) + get_filename_component(TEST_NAME ${TEST_SRC} NAME_WE) + add_simple_test_executable(${TEST_NAME}) + endforeach() + + if(NOT WIN32 AND ZLIB_COMPAT) + add_simple_test_executable(CVE-2003-0107) + endif() + add_simple_test_executable(example) set(MINIGZIP_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) @@ -1370,10 +1382,6 @@ if(ZLIB_ENABLE_TESTS) # Run tests targeting tools include(cmake/test-tools.cmake) - if(NOT WIN32 AND ZLIB_COMPAT) - add_simple_test_executable(CVE-2003-0107) - endif() - add_test(NAME GH-361 COMMAND ${CMAKE_COMMAND} "-DTARGET=${MINIGZIP_COMMAND}" @@ -1440,11 +1448,6 @@ if(ZLIB_ENABLE_TESTS) -DTEST_NAME=GH-751-test-txt -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-751/test.txt -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake) - - add_simple_test_executable(deflate_quick_bi_valid) - add_simple_test_executable(deflate_quick_block_open) - add_simple_test_executable(inflate_adler32) - add_simple_test_executable(hash_head_0) endif() add_feature_info(WITH_GZFILEOP WITH_GZFILEOP "Compile with support for gzFile related functions") diff --git a/Makefile.in b/Makefile.in index ca2b1127f..5d86f7867 100644 --- a/Makefile.in +++ b/Makefile.in @@ -154,9 +154,9 @@ PIC_OBJS = $(PIC_OBJC) all: static shared -static: adler32_test$(EXE) crc32_test$(EXE) example$(EXE) minigzip$(EXE) fuzzers makefixed$(EXE) maketrees$(EXE) makecrct$(EXE) +static: test_adler32$(EXE) test_crc32$(EXE) example$(EXE) minigzip$(EXE) fuzzers makefixed$(EXE) maketrees$(EXE) makecrct$(EXE) -shared: adler32_testsh$(EXE) crc32_testsh$(EXE) examplesh$(EXE) minigzipsh$(EXE) +shared: test_adler32sh$(EXE) test_crc32sh$(EXE) examplesh$(EXE) minigzipsh$(EXE) check: test @@ -248,12 +248,6 @@ $(STATICLIB): $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 -adler32_test.o: - $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/adler32_test.c - -crc32_test.o: - $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/crc32_test.c - example.o: $(CC) $(CFLAGS) -DWITH_GZFILEOP $(INCLUDES) -c -o $@ $(SRCDIR)/test/example.c @@ -269,6 +263,12 @@ maketrees.o: makecrct.o: $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/tools/makecrct.c +test_adler32.o: + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/test_adler32.c + +test_crc32.o: + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/test/test_crc32.c + zlibrc.o: win32/zlib$(SUFFIX)1.rc $(RC) $(RCFLAGS) -o $@ win32/zlib$(SUFFIX)1.rc @@ -311,18 +311,6 @@ ifneq ($(SHAREDLIB),$(SHAREDTARGET)) endif endif -adler32_test$(EXE): adler32_test.o $(OBJG) $(STATICLIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ adler32_test.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC) -ifneq ($(STRIP),) - $(STRIP) $@ -endif - -crc32_test$(EXE): crc32_test.o $(STATICLIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ crc32_test.o $(TEST_LIBS) $(LDSHAREDLIBC) -ifneq ($(STRIP),) - $(STRIP) $@ -endif - example$(EXE): example.o $(OBJG) $(STATICLIB) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC) ifneq ($(STRIP),) @@ -335,14 +323,14 @@ ifneq ($(STRIP),) $(STRIP) $@ endif -adler32_testsh$(EXE): adler32_test.o $(PIC_TESTOBJG) $(SHAREDTARGET) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ adler32_test.o $(PIC_TESTOBJG) $(SHAREDTARGET) $(LDSHAREDLIBC) +test_adler32$(EXE): test_adler32.o $(OBJG) $(STATICLIB) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test_adler32.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC) ifneq ($(STRIP),) $(STRIP) $@ endif -crc32_testsh$(EXE): crc32_test.o $(SHAREDTARGET) - $(CC) $(LDFLAGS) -o $@ crc32_test.o $(SHAREDTARGET) $(LDSHAREDLIBC) +test_crc32$(EXE): test_crc32.o $(STATICLIB) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test_crc32.o $(TEST_LIBS) $(LDSHAREDLIBC) ifneq ($(STRIP),) $(STRIP) $@ endif @@ -359,6 +347,18 @@ ifneq ($(STRIP),) $(STRIP) $@ endif +test_adler32sh$(EXE): test_adler32.o $(PIC_TESTOBJG) $(SHAREDTARGET) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test_adler32.o $(PIC_TESTOBJG) $(SHAREDTARGET) $(LDSHAREDLIBC) +ifneq ($(STRIP),) + $(STRIP) $@ +endif + +test_crc32sh$(EXE): test_crc32.o $(SHAREDTARGET) + $(CC) $(LDFLAGS) -o $@ test_crc32.o $(SHAREDTARGET) $(LDSHAREDLIBC) +ifneq ($(STRIP),) + $(STRIP) $@ +endif + makefixed$(EXE): makefixed.o $(OBJG) $(STATICLIB) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ makefixed.o $(OBJG) $(TEST_LIBS) $(LDSHAREDLIBC) ifneq ($(STRIP),) @@ -439,8 +439,8 @@ clean: @if [ -f $(ARCHDIR)/Makefile ]; then $(MAKE) -C $(ARCHDIR) clean; fi @if [ -f test/Makefile ]; then $(MAKE) -C test clean; fi rm -f *.o *.lo *~ \ - adler32_test$(EXE) crc32_test$(EXE) example$(EXE) minigzip$(EXE) \ - adler32_testsh$(EXE) crc32_testsh$(EXE) examplesh$(EXE) minigzipsh$(EXE) \ + test_adler32$(EXE) test_crc32$(EXE) example$(EXE) minigzip$(EXE) \ + test_adler32sh$(EXE) test_crc32sh$(EXE) examplesh$(EXE) minigzipsh$(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) \ diff --git a/test/Makefile.in b/test/Makefile.in index ce6d06a35..f743fa84a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -48,7 +48,7 @@ endif teststatic: check_cross_dep @TMPST=tmpst_$$$$; \ HELLOST=tmphellost_$$$$; \ - if echo hello world | ${QEMU_RUN} ../minigzip$(EXE) > $$HELLOST && ${QEMU_RUN} ../minigzip$(EXE) -d < $$HELLOST && ${QEMU_RUN} ../example$(EXE) $$TMPST && ${QEMU_RUN} ../adler32_test$(EXE) && ${QEMU_RUN} ../crc32_test$(EXE); then \ + if echo hello world | ${QEMU_RUN} ../minigzip$(EXE) > $$HELLOST && ${QEMU_RUN} ../minigzip$(EXE) -d < $$HELLOST && ${QEMU_RUN} ../example$(EXE) $$TMPST && ${QEMU_RUN} ../test_adler32$(EXE) && ${QEMU_RUN} ../test_crc32$(EXE); then \ echo ' *** zlib test OK ***'; \ else \ echo ' *** zlib test FAILED ***'; exit 1; \ @@ -62,7 +62,7 @@ testshared: check_cross_dep SHLIB_PATH=`pwd`/..:$(SHLIB_PATH) ; export SHLIB_PATH; \ TMPSH=tmpsh_$$$$; \ HELLOSH=tmphellosh_$$$$; \ - if echo hello world | ${QEMU_RUN} ../minigzipsh$(EXE) > $$HELLOSH && ${QEMU_RUN} ../minigzipsh$(EXE) -d < $$HELLOSH && ${QEMU_RUN} ../examplesh$(EXE) $$TMPSH && ${QEMU_RUN} ../adler32_testsh$(EXE) && ${QEMU_RUN} ../crc32_testsh$(EXE); then \ + if echo hello world | ${QEMU_RUN} ../minigzipsh$(EXE) > $$HELLOSH && ${QEMU_RUN} ../minigzipsh$(EXE) -d < $$HELLOSH && ${QEMU_RUN} ../examplesh$(EXE) $$TMPSH && ${QEMU_RUN} ../test_adler32sh$(EXE) && ${QEMU_RUN} ../test_crc32sh$(EXE); then \ echo ' *** zlib shared test OK ***'; \ else \ echo ' *** zlib shared test FAILED ***'; exit 1; \ diff --git a/test/adler32_test.c b/test/test_adler32.c similarity index 99% rename from test/adler32_test.c rename to test/test_adler32.c index f681877d3..38f890956 100644 --- a/test/adler32_test.c +++ b/test/test_adler32.c @@ -1,4 +1,4 @@ -/* adler32_test.c -- unit test for adler32 in the zlib compression library +/* test_adler32.c -- unit test for adler32 in the zlib compression library * Copyright (C) 2020 IBM Corporation * Author: Rogerio Alves * For conditions of distribution and use, see copyright notice in zlib.h diff --git a/test/crc32_test.c b/test/test_crc32.c similarity index 99% rename from test/crc32_test.c rename to test/test_crc32.c index c625b501a..6d112c4a6 100644 --- a/test/crc32_test.c +++ b/test/test_crc32.c @@ -1,4 +1,4 @@ -/* crc32_test.c -- crc32 unit test +/* test_crc32.c -- crc32 unit test * Copyright (C) 2019-2021 IBM Corporation * Authors: Rogerio Alves * Matheus Castanho diff --git a/test/deflate_quick_bi_valid.c b/test/test_deflate_quick_bi_valid.c similarity index 100% rename from test/deflate_quick_bi_valid.c rename to test/test_deflate_quick_bi_valid.c diff --git a/test/deflate_quick_block_open.c b/test/test_deflate_quick_block_open.c similarity index 100% rename from test/deflate_quick_block_open.c rename to test/test_deflate_quick_block_open.c diff --git a/test/hash_head_0.c b/test/test_hash_head_0.c similarity index 100% rename from test/hash_head_0.c rename to test/test_hash_head_0.c diff --git a/test/inflate_adler32.c b/test/test_inflate_adler32.c similarity index 100% rename from test/inflate_adler32.c rename to test/test_inflate_adler32.c