Merging upstream version 1.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 207 insertions, 302 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 70b49d3..3986d71 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009-2016 Antonio Diaz Diaz.
+# Copyright (C) 2009-2017 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.
@@ -27,12 +27,12 @@ if [ ! -f "${ZUPDATE}" ] || [ ! -x "${ZUPDATE}" ] ; then
 	exit 1
 fi
 
-if [ -e "${ZUPDATE}" ] 2> /dev/null ; then true
-else
+[ -e "${ZUPDATE}" ] 2> /dev/null ||
+	{
 	echo "$0: a POSIX shell is required to run the tests"
 	echo "Try bash -c \"$0 $1 $2\""
 	exit 1
-fi
+	}
 
 if [ -d tmp ] ; then rm -rf tmp ; fi
 mkdir tmp
@@ -52,343 +52,261 @@ cat in.lz > -in-.lz || framework_failure
 cat in.lz > lz_only.lz || framework_failure
 cat in in in in in in > in6 || framework_failure
 fail=0
+test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 
 printf "testing    zcat-%s..." "$2"
 
 for i in ${extensions}; do
-	"${ZCAT}" -N in.$i > copy || fail=1
-	cmp in copy || fail=1
-	printf .
-	"${ZCAT}" -N --format=un in.$i > copy || fail=1
-	cmp in copy || fail=1
-	printf .
-	"${ZCAT}" -N --force-format=$i in.$i > copy || fail=1
-	cmp in copy || fail=1
-	printf .
-	"${ZCAT}" -N in.$i | dd bs=1000 count=1 > copy 2> /dev/null || fail=1
-	dd if=in bs=1000 count=1 2> /dev/null | cmp - copy || fail=1
-	printf .
+	"${ZCAT}" -N in.$i > copy || test_failed $LINENO $i
+	cmp in copy || test_failed $LINENO $i
+	"${ZCAT}" -N --format=un in.$i > copy || test_failed $LINENO $i
+	cmp in copy || test_failed $LINENO $i
+	"${ZCAT}" -N --force-format=$i in.$i > copy || test_failed $LINENO $i
+	cmp in copy || test_failed $LINENO $i
+	"${ZCAT}" -N in.$i | dd bs=1000 count=1 > copy 2> /dev/null ||
+		test_failed $LINENO $i
+	dd if=in bs=1000 count=1 2> /dev/null | cmp - copy ||
+		test_failed $LINENO $i
 done
 
-"${ZCAT}" -N < in > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N < in.gz > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N < in.bz2 > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N < in.lz > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N -O lz - - < in.lz > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N --lz='lzip -q' < in.lz > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N in > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N lz_only > copy || fail=1
-cmp in copy || fail=1
-printf .
-"${ZCAT}" -N in in.gz in.bz2 in.lz -- -in- -in-.lz > copy || fail=1
-cmp in6 copy || fail=1
-printf .
+"${ZCAT}" -N < in > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N < in.gz > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N < in.bz2 > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N < in.lz > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N -O lz - - < in.lz > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N --lz='lzip -q' < in.lz > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N in > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N lz_only > copy || test_failed $LINENO
+cmp in copy || test_failed $LINENO
+"${ZCAT}" -N in in.gz in.bz2 in.lz -- -in- -in-.lz > copy || test_failed $LINENO
+cmp in6 copy || test_failed $LINENO
 "${ZCAT}" -Nq --format=, in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --format=,lz in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --format=gz,,lz in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --format=lz,, in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --format=nc in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --lz='-lzip -q' in.lz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -N --force-format=gz in.bz2 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -N --force-format=bz2 in.lz 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -Nq --force-format=lz in.gz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZCAT}" -N --bad-option 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 
 
 printf "\ntesting    zcmp-%s..." "$2"
 
 for i in ${extensions}; do
-	"${ZCMP}" -N in.$i || fail=1
-	printf .
-	"${ZCMP}" -N in in.$i || fail=1
-	printf .
-	"${ZCMP}" -N -i 100 -n 500 in6 in.$i || fail=1
-	printf .
-	"${ZCMP}" -N in in.$i --force-format=,$i || fail=1
-	printf .
-	"${ZCMP}" -N in.$i in || fail=1
-	printf .
-	"${ZCMP}" -N -i 1000:1000 -n 50 in.$i in6 || fail=1
-	printf .
-	"${ZCMP}" -N in.$i in --force-format=$i || fail=1
-	printf .
+	"${ZCMP}" -N in.$i || test_failed $LINENO $i
+	"${ZCMP}" -N in in.$i || test_failed $LINENO $i
+	"${ZCMP}" -N -i 1kB:1000 -n 500 in6 in.$i || test_failed $LINENO $i
+	"${ZCMP}" -N in in.$i --force-format=,$i || test_failed $LINENO $i
+	"${ZCMP}" -N in.$i in || test_failed $LINENO $i
+	"${ZCMP}" -N -i 1KiB:1024 -n 50 in.$i in6 || test_failed $LINENO $i
+	"${ZCMP}" -N in.$i in --force-format=$i || test_failed $LINENO $i
 done
 
 "${ZCMP}" -Nq in in6
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZCMP}" -N -n 0 in in6 || fail=1
-"${ZCMP}" -N -n 100 in in6 || fail=1
-"${ZCMP}" -N -n 1000 in in6 || fail=1
-"${ZCMP}" -N -n 10000 in in6 || fail=1
-printf .
+[ $? = 1 ] || test_failed $LINENO
+"${ZCMP}" -N -n 0 in in6 || test_failed $LINENO
+"${ZCMP}" -N -n 100B in in6 || test_failed $LINENO
+"${ZCMP}" -N -n 1k in in6 || test_failed $LINENO
+"${ZCMP}" -N -n 10kB in in6 || test_failed $LINENO
 "${ZCMP}" -Nq in.tar pin.tar
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZCMP}" -Nq -i 0,11 in.tar pin.tar
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZCMP}" -N -i 0,11 -n 0 in.tar pin.tar || fail=1
-"${ZCMP}" -N -i 0,11 -n 100 in.tar pin.tar || fail=1
-"${ZCMP}" -N -i 0,11 -n 1000 in.tar pin.tar || fail=1
-"${ZCMP}" -N -i 0,11 -n 10000 in.tar pin.tar || fail=1
-printf .
-"${ZCMP}" -N - || fail=1
-printf .
-"${ZCMP}" -N in in || fail=1
-printf .
-"${ZCMP}" -N in || fail=1
-printf .
-"${ZCMP}" -N in.lz in.gz || fail=1
-printf .
-"${ZCMP}" -N --lz='lzip -q' in.lz in.gz || fail=1
-printf .
-"${ZCMP}" -N in.gz -- -in-.lz || fail=1
-printf .
-"${ZCMP}" -N -- -in-.lz in.gz || fail=1
-printf .
-"${ZCMP}" -N in -- -in-.lz || fail=1
-printf .
-"${ZCMP}" -N -- -in- in.lz || fail=1
-printf .
-"${ZCMP}" -N in.lz -- -in- || fail=1
-printf .
-"${ZCMP}" -N -- -in-.lz in || fail=1
-printf .
-"${ZCMP}" -N -- -in- in || fail=1
-printf .
-"${ZCMP}" -N in -- -in- || fail=1
-printf .
-"${ZCMP}" -N lz_only.lz < in || fail=1
-printf .
-"${ZCMP}" -N in.lz - < in || fail=1
-printf .
-"${ZCMP}" -N - in.lz < in || fail=1
-printf .
-"${ZCMP}" -N in - < in.lz || fail=1
-printf .
-"${ZCMP}" -N - in < in.lz || fail=1
-printf .
+[ $? = 1 ] || test_failed $LINENO
+"${ZCMP}" -Nq -i 0B:11B in.tar pin.tar
+[ $? = 1 ] || test_failed $LINENO
+"${ZCMP}" -N -i 0:11 -n 0 in.tar pin.tar || test_failed $LINENO
+"${ZCMP}" -N -i 0:11 -n 100 in.tar pin.tar || test_failed $LINENO
+"${ZCMP}" -N -i 0:11 -n 1Ki in.tar pin.tar || test_failed $LINENO
+"${ZCMP}" -N -i 0:11 -n 10KiB in.tar pin.tar || test_failed $LINENO
+"${ZCMP}" -N - || test_failed $LINENO
+"${ZCMP}" -N in in || test_failed $LINENO
+"${ZCMP}" -N in || test_failed $LINENO
+"${ZCMP}" -N in.lz in.gz || test_failed $LINENO
+"${ZCMP}" -N --lz='lzip -q' in.lz in.gz || test_failed $LINENO
+"${ZCMP}" -N in.gz -- -in-.lz || test_failed $LINENO
+"${ZCMP}" -N -- -in-.lz in.gz || test_failed $LINENO
+"${ZCMP}" -N in -- -in-.lz || test_failed $LINENO
+"${ZCMP}" -N -- -in- in.lz || test_failed $LINENO
+"${ZCMP}" -N in.lz -- -in- || test_failed $LINENO
+"${ZCMP}" -N -- -in-.lz in || test_failed $LINENO
+"${ZCMP}" -N -- -in- in || test_failed $LINENO
+"${ZCMP}" -N in -- -in- || test_failed $LINENO
+"${ZCMP}" -N lz_only.lz < in || test_failed $LINENO
+"${ZCMP}" -N in.lz - < in || test_failed $LINENO
+"${ZCMP}" -N - in.lz < in || test_failed $LINENO
+"${ZCMP}" -N in - < in.lz || test_failed $LINENO
+"${ZCMP}" -N - in < in.lz || test_failed $LINENO
 "${ZCMP}" -N -q --force-format=lz in.lz
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZCMP}" -Nq --force-format=lz in.gz in.lz
 r=$?
-if [ $r = 1 ] || [ $r = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+{ [ $r = 1 ] || [ $r = 2 ] ; } || test_failed $LINENO
+"${ZCMP}" -Nq -i 100BB in in
+[ $? = 2 ] || test_failed $LINENO
+"${ZCMP}" -Nq -i 100BB:100 in in
+[ $? = 2 ] || test_failed $LINENO
+"${ZCMP}" -Nq -i 100: in in
+[ $? = 2 ] || test_failed $LINENO
 "${ZCMP}" -Nq -n -1 in in
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
+"${ZCMP}" -Nq -n 100BB in in
+[ $? = 2 ] || test_failed $LINENO
 "${ZCMP}" -N --bad-option in in 2> /dev/null
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 
 
 printf "\ntesting   zdiff-%s..." "$2"
 
 for i in ${extensions}; do
-	"${ZDIFF}" -N in.$i > /dev/null || fail=1
-	printf .
-	"${ZDIFF}" -N in in.$i > /dev/null || fail=1
-	printf .
-	"${ZDIFF}" -N --force-format=,$i in in.$i > /dev/null || fail=1
-	printf .
-	"${ZDIFF}" -N in.$i in > /dev/null || fail=1
-	printf .
-	"${ZDIFF}" -N --force-format=$i, in.$i in > /dev/null || fail=1
-	printf .
+	"${ZDIFF}" -N in.$i > /dev/null || test_failed $LINENO $i
+	"${ZDIFF}" -N in in.$i > /dev/null || test_failed $LINENO $i
+	"${ZDIFF}" -N --force-format=,$i in in.$i > /dev/null ||
+		test_failed $LINENO $i
+	"${ZDIFF}" -N in.$i in > /dev/null || test_failed $LINENO $i
+	"${ZDIFF}" -N --force-format=$i, in.$i in > /dev/null ||
+		test_failed $LINENO $i
 done
 
-"${ZDIFF}" -N in in6 > /dev/null
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZDIFF}" -N in.tar pin.tar > /dev/null
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZDIFF}" -N - || fail=1
-printf .
-"${ZDIFF}" -N in in || fail=1
-printf .
-"${ZDIFF}" -N in || fail=1
-printf .
-"${ZDIFF}" -N --format=gz,bz2 in || fail=1
-printf .
-"${ZDIFF}" -N --format=gz in || fail=1
-printf .
-"${ZDIFF}" -N in.lz in.gz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N --lz='lzip -q' in.lz in.gz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in.gz -- -in-.lz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N -- -in-.lz in.gz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in -- -in-.lz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N -- -in- in.lz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in.lz -- -in- > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N -- -in-.lz in > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N -- -in- in > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in -- -in- > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N lz_only.lz < in > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in.lz - < in > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N - in.lz < in > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N in - < in.lz > /dev/null || fail=1
-printf .
-"${ZDIFF}" -N - in < in.lz > /dev/null || fail=1
-printf .
+"${ZDIFF}" -N in in6 > /dev/null && test_failed $LINENO
+"${ZDIFF}" -N in.tar pin.tar > /dev/null && test_failed $LINENO
+"${ZDIFF}" -N - || test_failed $LINENO
+"${ZDIFF}" -N in in || test_failed $LINENO
+"${ZDIFF}" -N in || test_failed $LINENO
+"${ZDIFF}" -N --format=gz,bz2 in || test_failed $LINENO
+"${ZDIFF}" -N --format=gz in || test_failed $LINENO
+"${ZDIFF}" -N in.lz in.gz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N --lz='lzip -q' in.lz in.gz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in.gz -- -in-.lz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N -- -in-.lz in.gz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in -- -in-.lz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N -- -in- in.lz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in.lz -- -in- > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N -- -in-.lz in > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N -- -in- in > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in -- -in- > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N lz_only.lz < in > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in.lz - < in > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N - in.lz < in > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N in - < in.lz > /dev/null || test_failed $LINENO
+"${ZDIFF}" -N - in < in.lz > /dev/null || test_failed $LINENO
 "${ZDIFF}" -N --bz2='-bzip2' in.bz2 2> /dev/null
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZDIFF}" -N -q --force-format=bz2 in.bz2 2> /dev/null
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZDIFF}" -N -q --force-format=,lz in.lz in.bz2 > /dev/null 2>&1
 r=$?
-if [ $r = 1 ] || [ $r = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+{ [ $r = 1 ] || [ $r = 2 ] ; } || test_failed $LINENO
 "${ZDIFF}" -N --bad-option 2> /dev/null
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 
 mkdir tmp2
 cat in > tmp2/a || framework_failure
 cat in.lz > tmp2/a.lz || framework_failure
 "${ZDIFF}" -N --format=bz2 tmp2/a < /dev/null > /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZDIFF}" -N --format=gz tmp2/a < /dev/null > /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZDIFF}" -N --format=lz tmp2/a.lz < /dev/null > /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZDIFF}" -N --format=lz tmp2/a < /dev/null
-if [ $? = 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZDIFF}" -N --format=un tmp2/a.lz < /dev/null
-if [ $? = 0 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
+"${ZDIFF}" -N --format=lz tmp2/a < /dev/null || test_failed $LINENO
+"${ZDIFF}" -N --format=un tmp2/a.lz < /dev/null || test_failed $LINENO
 rm -r tmp2 || framework_failure
 
 
 printf "\ntesting   zgrep-%s..." "$2"
 
 for i in ${extensions}; do
-	"${ZGREP}" -N "GNU" in.$i > /dev/null || fail=1
-	printf .
-	"${ZGREP}" -N "GNU" < in.$i > /dev/null || fail=1
-	printf .
-	"${ZGREP}" -N -l "GNU" in.$i > /dev/null || fail=1
-	printf .
-	"${ZGREP}" -N -L "GNU" in.$i || fail=1
-	printf .
-	"${ZGREP}" -N --force-format=$i "GNU" in.$i > /dev/null || fail=1
-	printf .
-	"${ZGREP}" -N -v "nx_pattern" in.$i > /dev/null || fail=1
-	printf .
-	"${ZGREP}" -N "nx_pattern" in.$i
-	if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-	"${ZGREP}" -N -l "nx_pattern" in.$i
-	if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-	"${ZGREP}" -N -L "nx_pattern" in.$i > /dev/null
-	if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
+	"${ZGREP}" -N "GNU" in.$i > /dev/null || test_failed $LINENO $i
+	"${ZGREP}" -N "GNU" < in.$i > /dev/null || test_failed $LINENO $i
+	"${ZGREP}" -N -l "GNU" in.$i > /dev/null || test_failed $LINENO $i
+	"${ZGREP}" -N -L "GNU" in.$i || test_failed $LINENO $i
+	"${ZGREP}" -N --force-format=$i "GNU" in.$i > /dev/null ||
+		test_failed $LINENO $i
+	"${ZGREP}" -N -v "nx_pattern" in.$i > /dev/null ||
+		test_failed $LINENO $i
+	"${ZGREP}" -N "nx_pattern" in.$i && test_failed $LINENO $i
+	"${ZGREP}" -N -l "nx_pattern" in.$i && test_failed $LINENO $i
+	"${ZGREP}" -N -L "nx_pattern" in.$i > /dev/null &&
+		test_failed $LINENO $i
 	"${ZGREP}" -N --force-format=$i "GNU" in 2> /dev/null
-	if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+	[ $? = 2 ] || test_failed $LINENO $i
 done
 
-"${ZGREP}" -N pin.tar -e "GNU" > /dev/null || fail=1
-printf .
-"${ZGREP}" -N "GNU" < pin.tar > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -r "GNU" . > /dev/null || fail=1
-printf .
-"${ZGREP}" -N "nx_pattern" -r . in > /dev/null
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZGREP}" -N -e "GNU" in > /dev/null || fail=1
-printf .
-"${ZGREP}" -N "GNU" < in > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -O lz "nx_pattern" - - < in.lz > /dev/null
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZGREP}" -N -e "-free" --lz='lzip -q' < in.lz > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -- "-free" -in- > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -q -- "-free" nx_file -in-.lz
-if [ $? = 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZGREP}" -N "GNU" in in.gz in.bz2 in.lz -- -in- > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -l "GNU" in in.gz in.bz2 in.lz -- -in- > /dev/null || fail=1
-printf .
-"${ZGREP}" -N -L "GNU" in in.gz in.bz2 in.lz -- -in- || fail=1
-printf .
-"${ZGREP}" -N -l "nx_pattern" in in.gz in.bz2 in.lz -- -in-
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
-"${ZGREP}" -N -L "nx_pattern" in in.gz in.bz2 in.lz -- -in- > /dev/null
-if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${ZGREP}" -N pin.tar -e "GNU" > /dev/null || test_failed $LINENO
+"${ZGREP}" -N "GNU" < pin.tar > /dev/null || test_failed $LINENO
+"${ZGREP}" -N -r "GNU" . > /dev/null || test_failed $LINENO
+"${ZGREP}" -N "nx_pattern" -r . in > /dev/null && test_failed $LINENO
+"${ZGREP}" -N -e "GNU" in > /dev/null || test_failed $LINENO
+"${ZGREP}" -N "GNU" < in > /dev/null || test_failed $LINENO
+"${ZGREP}" -N -O lz "nx_pattern" - - < in.lz > /dev/null && test_failed $LINENO
+"${ZGREP}" -N -e "-free" --lz='lzip -q' < in.lz > /dev/null ||
+	test_failed $LINENO
+"${ZGREP}" -N -- "-free" -in- > /dev/null || test_failed $LINENO
+"${ZGREP}" -N -q -- "-free" nx_file -in-.lz || test_failed $LINENO
+"${ZGREP}" -N "GNU" in in.gz in.bz2 in.lz -- -in- > /dev/null ||
+	test_failed $LINENO
+"${ZGREP}" -N -l "GNU" in in.gz in.bz2 in.lz -- -in- > /dev/null ||
+	test_failed $LINENO
+"${ZGREP}" -N -L "GNU" in in.gz in.bz2 in.lz -- -in- || test_failed $LINENO
+"${ZGREP}" -N -l "nx_pattern" in in.gz in.bz2 in.lz -- -in- &&
+	test_failed $LINENO
+"${ZGREP}" -N -L "nx_pattern" in in.gz in.bz2 in.lz -- -in- > /dev/null &&
+	test_failed $LINENO
 "${ZGREP}" -N --bad-option 2> /dev/null
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZGREP}" -N "GNU" -s nx_file
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZGREP}" -N -q
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 
-"${ZEGREP}" -N "GNU" in > /dev/null || fail=1
-printf .
-"${ZFGREP}" -N "GNU" in > /dev/null || fail=1
-printf .
+"${ZEGREP}" -N "GNU" in > /dev/null || test_failed $LINENO
+"${ZFGREP}" -N "GNU" in > /dev/null || test_failed $LINENO
 
 
 printf "\ntesting   ztest-%s..." "$2"
 
 for i in ${extensions}; do
-	"${ZTEST}" -N --force-format=$i < in.$i || fail=1
-	printf .
+	"${ZTEST}" -N --force-format=$i < in.$i || test_failed $LINENO $i
 	"${ZTEST}" -N --force-format=$i < in 2> /dev/null
-	if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+	[ $? = 2 ] || test_failed $LINENO $i
 	"${ZTEST}" -N --force-format=$i in 2> /dev/null
-	if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+	[ $? = 2 ] || test_failed $LINENO $i
 done
 
-"${ZTEST}" -N in in.gz in.bz2 in.lz -- -in- || fail=1
-printf .
-"${ZTEST}" -N < in.gz || fail=1
-printf .
-"${ZTEST}" -N < in.bz2 || fail=1
-printf .
-"${ZTEST}" -N < in.lz || fail=1
-printf .
-"${ZTEST}" -N - in.gz - < in.lz || fail=1
-printf .
-"${ZTEST}" -N --lz='lzip -q' < in.lz || fail=1
-printf .
-"${ZTEST}" -N -r . || fail=1
-printf .
+"${ZTEST}" -N in in.gz in.bz2 in.lz -- -in- || test_failed $LINENO
+"${ZTEST}" -N < in.gz || test_failed $LINENO
+"${ZTEST}" -N < in.bz2 || test_failed $LINENO
+"${ZTEST}" -N < in.lz || test_failed $LINENO
+"${ZTEST}" -N - in.gz - < in.lz || test_failed $LINENO
+"${ZTEST}" -N --lz='lzip -q' < in.lz || test_failed $LINENO
+"${ZTEST}" -N -r . || test_failed $LINENO
 "${ZTEST}" -Nq < in
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 dd if=in.lz bs=1000 count=1 2> /dev/null | "${ZTEST}" -N -q
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZTEST}" -Nq --force-format=lz in.bz2
-if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 2 ] || test_failed $LINENO
 "${ZTEST}" -N --lz='lzip --bad-option' in.lz 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZTEST}" -N --bad-option 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 
 
 printf "\ntesting zupdate-%s..." "$2"
@@ -396,68 +314,59 @@ printf "\ntesting zupdate-%s..." "$2"
 cat in.bz2 > a.bz2 || framework_failure
 cat in.gz > a.gz || framework_failure
 "${ZUPDATE}" -Nq --bz2=bad_command a.bz2
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -N --bz2='bzip2 --bad-option' a.bz2 > /dev/null 2>&1
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -Nq --gz=bad_command a.gz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -N --gz='gzip --bad-option' a.gz 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -Nq --lz=bad_command a.gz
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -N --lz='lzip --bad-option' a.gz 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 "${ZUPDATE}" -N --bad-option 2> /dev/null
-if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+[ $? = 1 ] || test_failed $LINENO
 
 cat in.lz in.lz > a.lz || framework_failure
 "${ZUPDATE}" -Nq -f a.bz2 a.gz
-if [ $? = 1 ] && [ -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 1 ] && [ -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; } ||
+	test_failed $LINENO
 rm -f a.lz || framework_failure
 
 "${ZUPDATE}" -N a.bz2
-if [ $? = 0 ] && [ ! -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ ! -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; } ||
+	test_failed $LINENO
 rm -f a.lz || framework_failure
 "${ZUPDATE}" -N a.gz
-if [ $? = 0 ] && [ ! -e a.bz2 ] && [ ! -e a.gz ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ ! -e a.bz2 ] && [ ! -e a.gz ] && [ -e a.lz ] ; } ||
+	test_failed $LINENO
 rm -f a.lz || framework_failure
 
 cat in.bz2 > a.bz2 || framework_failure
 cat in.gz > a.gz || framework_failure
 "${ZUPDATE}" -Nq a.bz2 a.gz
-if [ $? = 1 ] && [ ! -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 1 ] && [ ! -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; } ||
+	test_failed $LINENO
 rm -f a.lz || framework_failure
 
 cat in.bz2 > a.bz2 || framework_failure
 cat in.gz > a.gz || framework_failure
 "${ZUPDATE}" -N -f -k a.bz2 a.gz
-if [ $? = 0 ] && [ -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ -e a.bz2 ] && [ -e a.gz ] && [ -e a.lz ] ; } ||
+	test_failed $LINENO
 rm -f a.lz || framework_failure
 
 cat in.bz2 > a.bz2 || framework_failure
 cat in.gz > a.gz || framework_failure
 "${ZUPDATE}" -N -f a.bz2 a.gz
-if [ $? = 0 ] && [ ! -e a.bz2 ] && [ ! -e a.gz ] &&
-   [ ! -e a ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ ! -e a.bz2 ] && [ ! -e a.gz ] && [ ! -e a ] &&
+  [ -e a.lz ] ; } || test_failed $LINENO
 rm -f a.lz || framework_failure
 
 cat in.bz2 > a.bz2 || framework_failure
 "${ZUPDATE}" -N -1 -q a.bz2
-if [ $? = 0 ] && [ ! -e a.bz2 ] && [ -e a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ ! -e a.bz2 ] && [ -e a.lz ] ; } || test_failed $LINENO
 rm -f a.lz || framework_failure
 
 mkdir tmp2
@@ -465,16 +374,12 @@ mkdir tmp2/tmp3
 cat in.bz2 > tmp2/tmp3/a.bz2 || framework_failure
 cat in.gz > tmp2/tmp3/a.gz || framework_failure
 "${ZUPDATE}" -N -r --format=gz tmp2
-if [ $? = 0 ] && [ -e tmp2/tmp3/a.bz2 ] && [ ! -e tmp2/tmp3/a.gz ] &&
-   [ -e tmp2/tmp3/a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ -e tmp2/tmp3/a.bz2 ] && [ ! -e tmp2/tmp3/a.gz ] &&
+  [ -e tmp2/tmp3/a.lz ] ; } || test_failed $LINENO
 rm -f tmp2/tmp3/a.lz || framework_failure
 "${ZUPDATE}" -N -r --format=bz2 tmp2
-if [ $? = 0 ] && [ ! -e tmp2/tmp3/a.bz2 ] && [ ! -e tmp2/tmp3/a.gz ] &&
-   [ -e tmp2/tmp3/a.lz ] ; then printf .
-else printf - ; fail=1
-fi
+{ [ $? = 0 ] && [ ! -e tmp2/tmp3/a.bz2 ] && [ ! -e tmp2/tmp3/a.gz ] &&
+  [ -e tmp2/tmp3/a.lz ] ; } || test_failed $LINENO
 rm -r tmp2 || framework_failure
 
 echo