Remove crc32 and adler32 shared library tests which don't test anyting further than...

diff --git a/.gitignore b/.gitignore
index 532aed578acab3ef4d95266f824ac48945c5e878..ff0a5909579b2758c01ed244f3628728afa2e4eb 100644 (file)
--- 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 5d86f7867ba7d29f350cef5bf1eedb35c6c321a0..e7ad5a65063f3a135bc1233dfc916c2a3d7ca3fa 100644 (file)
--- 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 f743fa84a7ec400d7cb510f4b0fc3bd84acdc389..a32d0adf8d7ad087d6c4049e630334dc3828d2bc 100644 (file)
--- 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; \