From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 18 Jan 2022 00:32:02 +0000 (-0800)
Subject: Remove crc32 and adler32 shared library tests which don't test anyting further than... 
X-Git-Tag: 2.1.0-beta1~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a206e147b754d0dfc2632ad706a2c6e09ec9b095;p=thirdparty%2Fzlib-ng.git

Remove crc32 and adler32 shared library tests which don't test anyting further than what is provided by crc32 static build or examplesh.
---

diff --git a/.gitignore b/.gitignore
index 532aed578..ff0a59095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,7 @@
 *.gcov
 
 /test_adler32
-/test_adler32sh
 /test_crc32
-/test_crc32sh
 /example
 /example64
 /examplesh
diff --git a/Makefile.in b/Makefile.in
index 5d86f7867..e7ad5a650 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -156,7 +156,7 @@ all: static shared
 
 static: test_adler32$(EXE) test_crc32$(EXE) example$(EXE) minigzip$(EXE) fuzzers makefixed$(EXE) maketrees$(EXE) makecrct$(EXE)
 
-shared: test_adler32sh$(EXE) test_crc32sh$(EXE) examplesh$(EXE) minigzipsh$(EXE)
+shared: examplesh$(EXE) minigzipsh$(EXE)
 
 check: test
 
@@ -347,18 +347,6 @@ 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),)
@@ -440,7 +428,7 @@ clean:
 	@if [ -f test/Makefile ]; then $(MAKE) -C test clean; fi
 	rm -f *.o *.lo *~ \
 	   test_adler32$(EXE) test_crc32$(EXE) example$(EXE) minigzip$(EXE) \
-	   test_adler32sh$(EXE) test_crc32sh$(EXE) examplesh$(EXE) minigzipsh$(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 f743fa84a..a32d0adf8 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -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} ../test_adler32sh$(EXE) && ${QEMU_RUN} ../test_crc32sh$(EXE); then \
+	if echo hello world | ${QEMU_RUN} ../minigzipsh$(EXE) > $$HELLOSH && ${QEMU_RUN} ../minigzipsh$(EXE) -d < $$HELLOSH && ${QEMU_RUN} ../examplesh$(EXE) $$TMPSH; then \
 	  echo '		*** zlib shared test OK ***'; \
 	else \
 	  echo '		*** zlib shared test FAILED ***'; exit 1; \