Fix so Travis doesn't fail on CVE tests without --zlib-compat.

diff --git a/.travis.yml b/.travis.yml
index 6080169cf6806a0e49f4a92579648f36f160c767..e358fe1e193d960c56f3e4301de598476e069740 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ compiler:
   - gcc
   - clang
 env:
+  - BUILDDIR=. TOOL="./configure"
   - BUILDDIR=. TOOL="./configure --zlib-compat"
   - BUILDDIR=../build TOOL="../zlib-ng/configure --zlib-compat"
   - BUILDDIR=. TOOL="./configure --zlib-compat --without-optimizations --without-new-strategies"

diff --git a/test/testCVEinputs.sh b/test/testCVEinputs.sh
index 046856e788471224b309474a3f615f431d9c3893..de197d52fcccef8949a8468115f11d2d92ba3292 100755 (executable)
--- a/test/testCVEinputs.sh
+++ b/test/testCVEinputs.sh
@@ -9,7 +9,7 @@ for CVE in $CVEs; do
        ../minigzip -d < "$testcase"
        # we expect that a 1 error code is OK
        # for a vulnerable failure we'd expect 134 or similar
-       if [ $? -ne 1 ]; then
+       if [ $? -ne 1 ] && [ $? -ne 0 ]; then
            fail=1
        fi
     done