summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:30:25 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:30:25 +0000
commitb4e85477b84918c0fb9da281cebe4eff2a50f002 (patch)
tree545a8391c25b7e98c76f8deb43c3df7919e00111 /testsuite
parentAdding debian version 1.2~pre2-1. (diff)
downloadzutils-b4e85477b84918c0fb9da281cebe4eff2a50f002.tar.xz
zutils-b4e85477b84918c0fb9da281cebe4eff2a50f002.zip
Merging upstream version 1.2~pre3.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rwxr-xr-xtestsuite/check.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/check.sh b/testsuite/check.sh
index cd01c46..faf9dd3 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -46,9 +46,7 @@ cat in.lz > lz_only.lz || framework_failure
cat in in in in in in > in6 || framework_failure
fail=0
-printf "testing zutils-%s..." "$2"
-
-printf "\ntesting zcat-%s..." "$2"
+printf "testing zcat-%s..." "$2"
for i in ${extensions}; do
"${ZCAT}" -N in.$i > copy || fail=1
@@ -299,6 +297,8 @@ if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
if [ $? != 0 ] ; then printf . ; else printf - ; fail=1 ; fi
"${ZGREP}" -N --bad-option 2> /dev/null
if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${ZGREP}" -N "GNU" -s nx_file
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
"${ZEGREP}" -N "GNU" in > /dev/null || fail=1
printf .
@@ -388,8 +388,8 @@ rm -f x.lz || framework_failure
cat in.bz2 > x.bz2 || framework_failure
cat in.gz > x.gz || framework_failure
-"${ZUPDATE}" -N -f x.bz2 x.gz 2> /dev/null
-if [ $? = 0 ] && [ ! -e x.bz2 ] && [ ! -e x.gz ] && [ -e x.lz ] ; then printf .
+"${ZUPDATE}" -N -f -k x.bz2 x.gz 2> /dev/null
+if [ $? = 0 ] && [ -e x.bz2 ] && [ -e x.gz ] && [ -e x.lz ] ; then printf .
else printf - ; fail=1
fi
rm -f x.lz || framework_failure