13 files changed, 86 insertions, 426 deletions
diff --git a/testsuite/check.sh b/testsuite/check.sh
index dd9a60a..1f9b9e4 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # check script for Lzip - LZMA lossless data compressor
-# Copyright (C) 2008-2024 Antonio Diaz Diaz.
+# Copyright (C) 2008-2014 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
-# to copy, distribute, and modify it.
+# to copy, distribute and modify it.
 
 LC_ALL=C
 export LC_ALL
@@ -17,456 +17,116 @@ if [ ! -f "${LZIP}" ] || [ ! -x "${LZIP}" ] ; then
 	exit 1
 fi
 
-[ -e "${LZIP}" ] 2> /dev/null ||
-	{
-	echo "$0: a POSIX shell is required to run the tests"
-	echo "Try bash -c \"$0 $1 $2\""
-	exit 1
-	}
-
 if [ -d tmp ] ; then rm -rf tmp ; fi
 mkdir tmp
-cd "${objdir}"/tmp || framework_failure
+cd "${objdir}"/tmp
 
 cat "${testdir}"/test.txt > in || framework_failure
 in_lz="${testdir}"/test.txt.lz
-in_em="${testdir}"/test_em.txt.lz
-fox_lz="${testdir}"/fox.lz
-fox6_lz="${testdir}"/fox6.lz
-f6mk_lz="${testdir}"/fox6_mark.lz
 fail=0
-test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 
 printf "testing lzip-%s..." "$2"
 
-"${LZIP}" -fkqm4 in
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e in.lz ] || test_failed $LINENO
-"${LZIP}" -fkqm274 in
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e in.lz ] || test_failed $LINENO
-for i in bad_size -1 0 4095 513MiB 1G 1T 1P 1E 1Z 1Y 10KB ; do
-	"${LZIP}" -fkqs $i in
-	[ $? = 1 ] || test_failed $LINENO $i
-	[ ! -e in.lz ] || test_failed $LINENO $i
-done
-"${LZIP}" -lq in
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -tq in
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -tq < in
-[ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -cqm4 in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cqm274 in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cqs-1 in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cqs0 in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cqs4095 in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cqs513MiB in > /dev/null
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+printf "  in: Bad magic number (file not in lzip format).\n" > msg
+"${LZIP}" -t in 2> out
+if [ $? = 2 ] && cmp out msg ; then printf . ; else printf - ; fail=1 ; fi
+printf "  (stdin): Bad magic number (file not in lzip format).\n" > msg
+"${LZIP}" -t < in 2> out
+if [ $? = 2 ] && cmp out msg ; then printf . ; else printf - ; fail=1 ; fi
+rm -f out msg
 "${LZIP}" -cdq in
-[ $? = 2 ] || test_failed $LINENO
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIP}" -cdq < in
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -dq -o in < "${in_lz}"
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -dq -o in "${in_lz}"
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -dq -o out nx_file.lz
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e out ] || test_failed $LINENO
-"${LZIP}" -q -o out.lz nx_file
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e out.lz ] || test_failed $LINENO
-"${LZIP}" -qf -S100k -o out in in
-[ $? = 1 ] || test_failed $LINENO
-{ [ ! -e out ] && [ ! -e out.lz ] ; } || test_failed $LINENO
-# these are for code coverage
-"${LZIP}" -lt "${in_lz}" 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -cdl "${in_lz}" 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -cdt "${in_lz}" 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -t -- nx_file.lz 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -t "" < /dev/null 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --help > /dev/null || test_failed $LINENO
-"${LZIP}" -n1 -V > /dev/null || test_failed $LINENO
-"${LZIP}" -m 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -z 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --bad_option 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --t 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --test=2 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --output= 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" --output 2> /dev/null
-[ $? = 1 ] || test_failed $LINENO
-printf "LZIP\001-.............................." | "${LZIP}" -t 2> /dev/null
-printf "LZIP\002-.............................." | "${LZIP}" -t 2> /dev/null
-printf "LZIP\001+.............................." | "${LZIP}" -t 2> /dev/null
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+dd if="${in_lz}" bs=1 count=6 2> /dev/null | "${LZIP}" -tq
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+dd if="${in_lz}" bs=1 count=20 2> /dev/null | "${LZIP}" -tq
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
 
-printf "\ntesting decompression..."
-
-for i in "${in_lz}" "${in_em}" ; do
-	"${LZIP}" -lq "$i" || test_failed $LINENO "$i"
-	"${LZIP}" -t "$i" || test_failed $LINENO "$i"
-	"${LZIP}" -d "$i" -o out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -cd "$i" > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -d "$i" -o - > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	"${LZIP}" -d < "$i" > out || test_failed $LINENO "$i"
-	cmp in out || test_failed $LINENO "$i"
-	rm -f out || framework_failure
-done
+"${LZIP}" -t "${in_lz}" || fail=1
+"${LZIP}" -cd "${in_lz}" > copy || fail=1
+cmp in copy || fail=1
+printf .
 
-lines=`"${LZIP}" -tvv "${in_em}" 2>&1 | wc -l` || test_failed $LINENO
-[ "${lines}" -eq 8 ] || test_failed $LINENO "${lines}"
-"${LZIP}" -tq "${in_em}" --empty-error
-[ $? = 2 ] || test_failed $LINENO
-
-lines=`"${LZIP}" -lvv "${in_em}" | wc -l` || test_failed $LINENO
-[ "${lines}" -eq 11 ] || test_failed $LINENO "${lines}"
-"${LZIP}" -lq "${in_em}" --empty-error
-[ $? = 2 ] || test_failed $LINENO
-
-cat "${in_lz}" > out.lz || framework_failure
-"${LZIP}" -dk out.lz || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f out || framework_failure
-"${LZIP}" -cd "${fox_lz}" > fox || test_failed $LINENO
-cat fox > copy || framework_failure
 cat "${in_lz}" > copy.lz || framework_failure
-"${LZIP}" -d copy.lz out.lz 2> /dev/null	# skip copy, decompress out
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e out.lz ] || test_failed $LINENO
-cmp fox copy || test_failed $LINENO
-cmp in out || test_failed $LINENO
-"${LZIP}" -df copy.lz || test_failed $LINENO
-[ ! -e copy.lz ] || test_failed $LINENO
-cmp in copy || test_failed $LINENO
-rm -f copy out || framework_failure
+printf "to be overwritten" > copy || framework_failure
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
 
-cat "${in_lz}" > out.lz || framework_failure
-"${LZIP}" -d -S100k out.lz || test_failed $LINENO	# ignore -S
-[ ! -e out.lz ] || test_failed $LINENO
-cmp in out || test_failed $LINENO
+printf "to be overwritten" > copy || framework_failure
+"${LZIP}" -df -o copy < "${in_lz}" || fail=1
+cmp in copy || fail=1
+printf .
 
-printf "to be overwritten" > out || framework_failure
-"${LZIP}" -df -o out < "${in_lz}" || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f out || framework_failure
-"${LZIP}" -d -o ./- "${in_lz}" || test_failed $LINENO
-cmp in ./- || test_failed $LINENO
-rm -f ./- || framework_failure
-"${LZIP}" -d -o ./- < "${in_lz}" || test_failed $LINENO
-cmp in ./- || test_failed $LINENO
-rm -f ./- || framework_failure
-
-cat "${in_lz}" > anyothername || framework_failure
-"${LZIP}" -dv - anyothername - < "${in_lz}" > out 2> /dev/null ||
-	test_failed $LINENO
-cmp in out || test_failed $LINENO
-cmp in anyothername.out || test_failed $LINENO
-rm -f out anyothername.out || framework_failure
-
-"${LZIP}" -lq in "${in_lz}"
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -lq nx_file.lz "${in_lz}"
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -tq in "${in_lz}"
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -tq nx_file.lz "${in_lz}"
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -cdq in "${in_lz}" > out
-[ $? = 2 ] || test_failed $LINENO
-cat out in | cmp in - || test_failed $LINENO		# out must be empty
-"${LZIP}" -cdq nx_file.lz "${in_lz}" > out	# skip nx_file, decompress in
-[ $? = 1 ] || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f out || framework_failure
-cat "${in_lz}" > out.lz || framework_failure
-for i in 1 2 3 4 5 6 7 ; do
-	printf "g" >> out.lz || framework_failure
-	"${LZIP}" -alvv out.lz "${in_lz}" > /dev/null 2>&1
-	[ $? = 2 ] || test_failed $LINENO $i
-	"${LZIP}" -atvvvv out.lz "${in_lz}" 2> /dev/null
-	[ $? = 2 ] || test_failed $LINENO $i
-done
-"${LZIP}" -dq in out.lz
-[ $? = 2 ] || test_failed $LINENO
-[ -e out.lz ] || test_failed $LINENO
-[ ! -e out ] || test_failed $LINENO
-[ ! -e in.out ] || test_failed $LINENO
-"${LZIP}" -dq nx_file.lz out.lz
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e out.lz ] || test_failed $LINENO
-[ ! -e nx_file ] || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f out || framework_failure
+"${LZIP}" < in > anyothername || fail=1
+"${LZIP}" -d anyothername || fail=1
+cmp in anyothername.out || fail=1
+printf .
 
 cat in in > in2 || framework_failure
-"${LZIP}" -lq "${in_lz}" "${in_lz}" || test_failed $LINENO
-"${LZIP}" -t "${in_lz}" "${in_lz}" || test_failed $LINENO
-"${LZIP}" -cd "${in_lz}" "${in_lz}" -o out > out2 || test_failed $LINENO
-[ ! -e out ] || test_failed $LINENO			# override -o
-cmp in2 out2 || test_failed $LINENO
-rm -f out2 || framework_failure
-"${LZIP}" -d "${in_lz}" "${in_lz}" -o out2 || test_failed $LINENO
-cmp in2 out2 || test_failed $LINENO
-rm -f out2 || framework_failure
-
-cat "${in_lz}" "${in_lz}" > out2.lz || framework_failure
-printf "\ngarbage" >> out2.lz || framework_failure
-"${LZIP}" -tvvvv out2.lz 2> /dev/null || test_failed $LINENO
-"${LZIP}" -alq out2.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -atq out2.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -atq < out2.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -adkq out2.lz
-[ $? = 2 ] || test_failed $LINENO
-[ ! -e out2 ] || test_failed $LINENO
-"${LZIP}" -adkq -o out2 < out2.lz
-[ $? = 2 ] || test_failed $LINENO
-[ ! -e out2 ] || test_failed $LINENO
-printf "to be overwritten" > out2 || framework_failure
-"${LZIP}" -df out2.lz || test_failed $LINENO
-cmp in2 out2 || test_failed $LINENO
-rm -f out2 || framework_failure
-
-"${LZIP}" -cd "${fox6_lz}" > out || test_failed $LINENO
-"${LZIP}" -cd "${f6mk_lz}" > copy || test_failed $LINENO
-cmp copy out || test_failed $LINENO
-rm -f copy out || framework_failure
-"${LZIP}" -lq "${f6mk_lz}" --marking-error
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -tq "${f6mk_lz}" --marking-error
-[ $? = 2 ] || test_failed $LINENO
-
-"${LZIP}" -d "${fox_lz}" -o a/b/c/fox || test_failed $LINENO
-cmp fox a/b/c/fox || test_failed $LINENO
-rm -rf a || framework_failure
-"${LZIP}" -d -o a/b/c/fox < "${fox_lz}" || test_failed $LINENO
-cmp fox a/b/c/fox || test_failed $LINENO
-rm -rf a || framework_failure
-"${LZIP}" -dq "${fox_lz}" -o a/b/c/
-[ $? = 1 ] || test_failed $LINENO
-[ ! -e a ] || test_failed $LINENO
-
-printf "\ntesting   compression..."
-
-"${LZIP}" -c -0 in in in -S100k -o out3.lz > copy2.lz || test_failed $LINENO
-[ ! -e out3.lz ] || test_failed $LINENO			# override -o and -S
-"${LZIP}" -0f in in --output=copy2.lz || test_failed $LINENO
-"${LZIP}" -d copy2.lz -o out2 || test_failed $LINENO
-[ -e copy2.lz ] || test_failed $LINENO
-cmp in2 out2 || test_failed $LINENO
-rm -f in2 out2 copy2.lz || framework_failure
-
-"${LZIP}" -cf "${in_lz}" > lzlz 2> /dev/null	# /dev/null is a tty on OS/2
-[ $? = 1 ] || test_failed $LINENO
-"${LZIP}" -Fvvm36 -o - "${in_lz}" > lzlz 2> /dev/null || test_failed $LINENO
-"${LZIP}" -cd lzlz | "${LZIP}" -d > out || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f lzlz out || framework_failure
-
-"${LZIP}" -0 -o ./- in || test_failed $LINENO
-"${LZIP}" -cd ./- | cmp in - || test_failed $LINENO
-rm -f ./- || framework_failure
-"${LZIP}" -0 -o ./- < in || test_failed $LINENO			# add .lz
-[ ! -e ./- ] || test_failed $LINENO
-"${LZIP}" -cd -- -.lz | cmp in - || test_failed $LINENO
-rm -f ./-.lz || framework_failure
+"${LZIP}" -o copy2 < in2 || fail=1
+"${LZIP}" -t copy2.lz || fail=1
+printf .
+"${LZIP}" -cd copy2.lz > copy2 || fail=1
+cmp in2 copy2 || fail=1
+printf .
+
+printf "garbage" >> copy2.lz || framework_failure
+printf "to be overwritten" > copy2 || framework_failure
+"${LZIP}" -df copy2.lz || fail=1
+cmp in2 copy2 || fail=1
+printf .
+
+"${LZIP}" -cfq "${in_lz}" > out
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cF "${in_lz}" > out || fail=1
+"${LZIP}" -cd out | "${LZIP}" -d > copy || fail=1
+cmp in copy || fail=1
+printf .
 
 for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
-	"${LZIP}" -k -$i in || test_failed $LINENO $i
-	mv in.lz out.lz || test_failed $LINENO $i
-	printf "garbage" >> out.lz || framework_failure
-	"${LZIP}" -df out.lz || test_failed $LINENO $i
-	cmp in out || test_failed $LINENO $i
-
-	"${LZIP}" -$i in -c > out || test_failed $LINENO $i
-	"${LZIP}" -$i in -o o_out || test_failed $LINENO $i	# don't add .lz
-	[ ! -e o_out.lz ] || test_failed $LINENO
-	cmp out o_out || test_failed $LINENO $i
-	rm -f o_out || framework_failure
-	printf "g" >> out || framework_failure
-	"${LZIP}" -cd out > copy || test_failed $LINENO $i
-	cmp in copy || test_failed $LINENO $i
-
-	"${LZIP}" -$i < in > out || test_failed $LINENO $i
-	"${LZIP}" -d < out > copy || test_failed $LINENO $i
-	cmp in copy || test_failed $LINENO $i
-
-	rm -f out || framework_failure
-	printf "to be overwritten" > out.lz || framework_failure
-	"${LZIP}" -f -$i -o out < in || test_failed $LINENO $i	# add .lz
-	[ ! -e out ] || test_failed $LINENO
-	"${LZIP}" -df -o copy < out.lz || test_failed $LINENO $i
-	cmp in copy || test_failed $LINENO $i
+	"${LZIP}" -k -$i in || fail=1
+	mv -f in.lz copy.lz || fail=1
+	printf "garbage" >> copy.lz || fail=1
+	"${LZIP}" -df copy.lz || fail=1
+	cmp in copy || fail=1
 done
-rm -f copy out.lz || framework_failure
-
-cat in in in in in in in in > in8 || framework_failure
-"${LZIP}" -1s12 -S100k in8 || test_failed $LINENO
-"${LZIP}" -t in800001.lz in800002.lz || test_failed $LINENO
-"${LZIP}" -cd in800001.lz in800002.lz | cmp in8 - || test_failed $LINENO
-[ ! -e in800003.lz ] || test_failed $LINENO
-rm -f in800001.lz in800002.lz || framework_failure
-"${LZIP}" -1s12 -S100k -o out.lz in8 || test_failed $LINENO
-# ignore -S
-"${LZIP}" -d out.lz00001.lz out.lz00002.lz -S100k -o out || test_failed $LINENO
-cmp in8 out || test_failed $LINENO
-"${LZIP}" -t out.lz00001.lz out.lz00002.lz || test_failed $LINENO
-[ ! -e out.lz00003.lz ] || test_failed $LINENO
-rm -f out out.lz00001.lz out.lz00002.lz || framework_failure
-"${LZIP}" -1ks4Ki -b100000 in8 || test_failed $LINENO
-"${LZIP}" -t in8.lz || test_failed $LINENO
-"${LZIP}" -cd in8.lz -o out | cmp in8 - || test_failed $LINENO	# override -o
-[ ! -e out ] || test_failed $LINENO
-rm -f in8 || framework_failure
-"${LZIP}" -0 -S100k -o out < in8.lz || test_failed $LINENO
-"${LZIP}" -t out00001.lz out00002.lz || test_failed $LINENO
-"${LZIP}" -cd out00001.lz out00002.lz | cmp in8.lz - || test_failed $LINENO
-[ ! -e out00003.lz ] || test_failed $LINENO
-rm -f out00001.lz || framework_failure
-"${LZIP}" -1 -S100k -o a/b/c/out < in8.lz || test_failed $LINENO
-"${LZIP}" -t a/b/c/out00001.lz a/b/c/out00002.lz || test_failed $LINENO
-"${LZIP}" -cd a/b/c/out00001.lz a/b/c/out00002.lz | cmp in8.lz - ||
-	test_failed $LINENO
-[ ! -e a/b/c/out00003.lz ] || test_failed $LINENO
-rm -rf a || framework_failure
-"${LZIP}" -0 -F -S100k in8.lz || test_failed $LINENO
-"${LZIP}" -t in8.lz00001.lz in8.lz00002.lz || test_failed $LINENO
-"${LZIP}" -cd in8.lz00001.lz in8.lz00002.lz | cmp in8.lz - || test_failed $LINENO
-[ ! -e in8.lz00003.lz ] || test_failed $LINENO
-rm -f in8.lz00001.lz in8.lz00002.lz || framework_failure
-"${LZIP}" -0kF -b100k in8.lz || test_failed $LINENO
-"${LZIP}" -t in8.lz.lz || test_failed $LINENO
-"${LZIP}" -cd in8.lz.lz | cmp in8.lz - || test_failed $LINENO
-rm -f in8.lz in8.lz.lz || framework_failure
-
-"${LZIP}" fox -o a/b/c/fox.lz || test_failed $LINENO
-cmp "${fox_lz}" a/b/c/fox.lz || test_failed $LINENO
-rm -rf a || framework_failure
-"${LZIP}" -o a/b/c/fox.lz < fox || test_failed $LINENO
-cmp "${fox_lz}" a/b/c/fox.lz || test_failed $LINENO
-rm -rf a || framework_failure
-
-printf "\ntesting bad input..."
-
-headers='LZIp LZiP LZip LzIP LzIp LziP lZIP lZIp lZiP lzIP'
-body='\001\014\000\203\377\373\377\377\300\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000$\000\000\000\000\000\000\000'
-cat "${in_lz}" > int.lz || framework_failure
-printf "LZIP${body}" >> int.lz || framework_failure
-if "${LZIP}" -tq int.lz ; then
-	for header in ${headers} ; do
-		printf "${header}${body}" > int.lz || framework_failure
-		"${LZIP}" -lq int.lz			# first member
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq < int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -cdq int.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -lq --loose-trailing int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq --loose-trailing int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq --loose-trailing < int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -cdq --loose-trailing int.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		cat "${in_lz}" > int.lz || framework_failure
-		printf "${header}${body}" >> int.lz || framework_failure
-		"${LZIP}" -lq int.lz			# trailing data
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq < int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -cdq int.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -lq --loose-trailing int.lz ||
-			test_failed $LINENO ${header}
-		"${LZIP}" -t --loose-trailing int.lz ||
-			test_failed $LINENO ${header}
-		"${LZIP}" -t --loose-trailing < int.lz ||
-			test_failed $LINENO ${header}
-		"${LZIP}" -cd --loose-trailing int.lz > /dev/null ||
-			test_failed $LINENO ${header}
-		"${LZIP}" -lq --loose-trailing --trailing-error int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq --loose-trailing --trailing-error int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -tq --loose-trailing --trailing-error < int.lz
-		[ $? = 2 ] || test_failed $LINENO ${header}
-		"${LZIP}" -cdq --loose-trailing --trailing-error int.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO ${header}
-	done
-else
-	printf "\nwarning: skipping header test: 'printf' does not work on your system."
-fi
-rm -f int.lz || framework_failure
+printf .
 
-for i in fox_v2.lz fox_s11.lz fox_de20.lz \
-         fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
-	"${LZIP}" -tq "${testdir}"/$i
-	[ $? = 2 ] || test_failed $LINENO $i
+for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
+	"${LZIP}" -c -$i in > out || fail=1
+	printf "g" >> out || fail=1
+	"${LZIP}" -cd out > copy || fail=1
+	cmp in copy || fail=1
 done
+printf .
 
-for i in fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
-	"${LZIP}" -cdq "${testdir}"/$i > out
-	[ $? = 2 ] || test_failed $LINENO $i
-	cmp fox out || test_failed $LINENO $i
+for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
+	"${LZIP}" -$i < in > out || fail=1
+	"${LZIP}" -d < out > copy || fail=1
+	cmp in copy || fail=1
 done
-rm -f fox out || framework_failure
-
-cat "${in_lz}" "${in_lz}" > in2.lz || framework_failure
-cat "${in_lz}" "${in_lz}" "${in_lz}" > in3.lz || framework_failure
-if dd if=in3.lz of=trunc.lz bs=14752 count=1 2> /dev/null &&
-   [ -e trunc.lz ] && cmp in2.lz trunc.lz > /dev/null 2>&1 ; then
-	for i in 6 20 14734 14753 14754 14755 14756 14757 14758 ; do
-		dd if=in3.lz of=trunc.lz bs=$i count=1 2> /dev/null
-		"${LZIP}" -lq trunc.lz
-		[ $? = 2 ] || test_failed $LINENO $i
-		"${LZIP}" -tq trunc.lz
-		[ $? = 2 ] || test_failed $LINENO $i
-		"${LZIP}" -tq < trunc.lz
-		[ $? = 2 ] || test_failed $LINENO $i
-		"${LZIP}" -cdq trunc.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO $i
-		"${LZIP}" -dq < trunc.lz > /dev/null
-		[ $? = 2 ] || test_failed $LINENO $i
-	done
-else
-	printf "\nwarning: skipping truncation test: 'dd' does not work on your system."
-fi
-rm -f in2.lz in3.lz trunc.lz || framework_failure
+printf .
 
-cat "${in_lz}" > ingin.lz || framework_failure
-printf "g" >> ingin.lz || framework_failure
-cat "${in_lz}" >> ingin.lz || framework_failure
-"${LZIP}" -lq ingin.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -atq ingin.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -atq < ingin.lz
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -acdq ingin.lz > /dev/null
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -adq < ingin.lz > /dev/null
-[ $? = 2 ] || test_failed $LINENO
-"${LZIP}" -t ingin.lz || test_failed $LINENO
-"${LZIP}" -t < ingin.lz || test_failed $LINENO
-"${LZIP}" -cd ingin.lz > out || test_failed $LINENO
-cmp in out || test_failed $LINENO
-"${LZIP}" -d < ingin.lz > out || test_failed $LINENO
-cmp in out || test_failed $LINENO
-rm -f out ingin.lz || framework_failure
+for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
+	"${LZIP}" -f -$i -o out < in || fail=1
+	"${LZIP}" -df -o copy < out.lz || fail=1
+	cmp in copy || fail=1
+done
+printf .
 
 echo
 if [ ${fail} = 0 ] ; then
diff --git a/testsuite/fox.lz b/testsuite/fox.lz
deleted file mode 100644
index 509da82..0000000
--- a/testsuite/fox.lz
+++ /dev/null
diff --git a/testsuite/fox6.lz b/testsuite/fox6.lz
deleted file mode 100644
index 8401b99..0000000
--- a/testsuite/fox6.lz
+++ /dev/null
diff --git a/testsuite/fox6_mark.lz b/testsuite/fox6_mark.lz
deleted file mode 100644
index 32b2ac0..0000000
--- a/testsuite/fox6_mark.lz
+++ /dev/null
diff --git a/testsuite/fox_bcrc.lz b/testsuite/fox_bcrc.lz
deleted file mode 100644
index 8f6a7c4..0000000
--- a/testsuite/fox_bcrc.lz
+++ /dev/null
diff --git a/testsuite/fox_crc0.lz b/testsuite/fox_crc0.lz
deleted file mode 100644
index 1abe926..0000000
--- a/testsuite/fox_crc0.lz
+++ /dev/null
diff --git a/testsuite/fox_das46.lz b/testsuite/fox_das46.lz
deleted file mode 100644
index 43ed9f9..0000000
--- a/testsuite/fox_das46.lz
+++ /dev/null
diff --git a/testsuite/fox_de20.lz b/testsuite/fox_de20.lz
deleted file mode 100644
index 10949d8..0000000
--- a/testsuite/fox_de20.lz
+++ /dev/null
diff --git a/testsuite/fox_mes81.lz b/testsuite/fox_mes81.lz
deleted file mode 100644
index d50ef2e..0000000
--- a/testsuite/fox_mes81.lz
+++ /dev/null
diff --git a/testsuite/fox_s11.lz b/testsuite/fox_s11.lz
deleted file mode 100644
index dca909c..0000000
--- a/testsuite/fox_s11.lz
+++ /dev/null
diff --git a/testsuite/fox_v2.lz b/testsuite/fox_v2.lz
deleted file mode 100644
index 8620981..0000000
--- a/testsuite/fox_v2.lz
+++ /dev/null
diff --git a/testsuite/test.txt.lz b/testsuite/test.txt.lz
index 22cea6e..41d2e39 100644
--- a/testsuite/test.txt.lz
+++ b/testsuite/test.txt.lz
diff --git a/testsuite/test_em.txt.lz b/testsuite/test_em.txt.lz
deleted file mode 100644
index 7e96250..0000000
--- a/testsuite/test_em.txt.lz
+++ /dev/null