From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 17 Feb 2017 12:11:22 +0000 (+0200)
Subject: Some tests were missing EXE suffix.
X-Git-Tag: 1.9.9-b1~674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a099b220bb5726839b7db07562bef6e088d9ce6f;p=thirdparty%2Fzlib-ng.git

Some tests were missing EXE suffix.
---

diff --git a/test/Makefile.in b/test/Makefile.in
index 1fd8c00de..9d6047dd0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -18,7 +18,7 @@ oldtests: #set by ../configure
 
 teststatic:
 	@TMPST=tmpst_$$; \
-	if echo hello world | ../minigzip | ../minigzip -d && ../example $$TMPST ; then \
+	if echo hello world | ../minigzip$(EXE) | ../minigzip$(EXE) -d && ../example$(EXE) $$TMPST ; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
 	  echo '		*** zlib test FAILED ***'; exit 1; \
@@ -31,7 +31,7 @@ testshared:
 	DYLD_LIBRARY_PATH=`pwd`/..:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
 	SHLIB_PATH=`pwd`/..:$(SHLIB_PATH) ; export SHLIB_PATH; \
 	TMPSH=tmpsh_$$; \
-	if echo hello world | ../minigzipsh | ../minigzipsh -d && ../examplesh $$TMPSH; then \
+	if echo hello world | ../minigzipsh$(EXE) | ../minigzipsh$(EXE) -d && ../examplesh$(EXE) $$TMPSH; then \
 	  echo '		*** zlib shared test OK ***'; \
 	else \
 	  echo '		*** zlib shared test FAILED ***'; exit 1; \
@@ -40,7 +40,7 @@ testshared:
 
 test64:
 	@TMP64=tmp64_$$; \
-	if echo hello world | ../minigzip64 | ../minigzip64 -d && ../example64 $$TMP64; then \
+	if echo hello world | ../minigzip64$(EXE) | ../minigzip64$(EXE) -d && ../example64$(EXE) $$TMP64; then \
 	  echo '		*** zlib 64-bit test OK ***'; \
 	else \
 	  echo '		*** zlib 64-bit test FAILED ***'; exit 1; \
@@ -53,7 +53,7 @@ cvetests: testCVEinputs
 compattests: testCVE-2003-0107
 
 testCVEinputs:
-	@$(SRCDIR)/testCVEinputs.sh
+	@EXE=$(EXE) $(SRCDIR)/testCVEinputs.sh
 
 testCVE-2003-0107: CVE-2003-0107$(EXE)
 	@if ./CVE-2003-0107$(EXE); then \
diff --git a/test/testCVEinputs.sh b/test/testCVEinputs.sh
index de197d52f..f253d264d 100755
--- a/test/testCVEinputs.sh
+++ b/test/testCVEinputs.sh
@@ -6,7 +6,7 @@ CVEs="CVE-2002-0059 CVE-2004-0797 CVE-2005-1849 CVE-2005-2096"
 for CVE in $CVEs; do
     fail=0
     for testcase in ${TESTDIR}/${CVE}/*.gz; do
-	../minigzip -d < "$testcase"
+	../minigzip${EXE} -d < "$testcase"
 	# we expect that a 1 error code is OK
 	# for a vulnerable failure we'd expect 134 or similar
 	if [ $? -ne 1 ] && [ $? -ne 0 ]; then