Merging upstream version 1.13~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 3 insertions, 71 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 82bc47d..69291e2 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -10,26 +10,22 @@ export LC_ALL
 objdir=`pwd`
 testdir=`cd "$1" ; pwd`
 LZIP="${objdir}"/lzip
-LZIPRECOVER="${objdir}"/lziprecover
 framework_failure() { echo "failure in testing framework" ; exit 1 ; }
 
 if [ ! -x "${LZIP}" ] ; then
 	echo "${LZIP}: cannot execute"
 	exit 1
 fi
-if [ ! -x "${LZIPRECOVER}" ] ; then
-	echo "${LZIPRECOVER}: cannot execute"
-	exit 1
-fi
 
 if [ -d tmp ] ; then rm -rf tmp ; fi
 mkdir tmp
-printf "testing lzip-%s..." "$2"
 cd "${objdir}"/tmp
 
 cat "${testdir}"/test.txt > in || framework_failure
 fail=0
 
+printf "testing lzip-%s..." "$2"
+
 "${LZIP}" -t "${testdir}"/test_v0.lz || fail=1
 printf .
 "${LZIP}" -cd "${testdir}"/test_v0.lz > copy || fail=1
@@ -48,7 +44,7 @@ printf .
 cmp in copy || fail=1
 printf .
 
-"${LZIP}" -cf "${testdir}"/test_v1.lz > out 2>/dev/null
+"${LZIP}" -cfq "${testdir}"/test_v1.lz > out
 if [ $? != 1 ] ; then fail=1 ; printf - ; else printf . ; fi
 "${LZIP}" -cF "${testdir}"/test_v1.lz > out || fail=1
 "${LZIP}" -cd out | "${LZIP}" -d > copy || fail=1
@@ -91,70 +87,6 @@ done
 cmp in anyothername.out || fail=1
 printf .
 
-# Description of test files for lziprecover:
-# test_bad1.lz: byte at offset 67 changed from 0xCC to 0x33
-# test_bad2.lz: [  34-  66) --> copy of bytes [  68- 100)
-# test_bad3.lz: [ 512-1536) --> zeroed;       [2560-3584) --> zeroed
-# test_bad4.lz: [3072-4096) --> random data;  [4608-5632) --> zeroed
-# test_bad5.lz: [1024-2048) --> random data;  [5120-6144) --> random data
-
-printf "\ntesting lziprecover-%s..." "$2"
-
-"${LZIP}" -c in in in > out || fail=1
-printf "garbage" >> out || fail=1
-"${LZIPRECOVER}" -s out -o out.lz || fail=1
-for i in 1 2 3 ; do
-	"${LZIP}" -cd rec0000${i}out.lz > copy || fail=1
-	cmp in copy || fail=1
-	printf .
-done
-
-"${LZIP}" -0kf -$i in || fail=1
-"${LZIPRECOVER}" -R in.lz || fail=1
-printf .
-"${LZIPRECOVER}" -R "${testdir}"/test_v1.lz || fail=1
-printf .
-
-"${LZIPRECOVER}" -R -o copy.lz "${testdir}"/test_bad1.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-
-"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad1.lz "${testdir}"/test_bad2.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad2.lz "${testdir}"/test_bad1.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-
-for i in 1 2 ; do
-	for j in 3 4 5 ; do
-		"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad${i}.lz "${testdir}"/test_bad${j}.lz || fail=1
-		"${LZIP}" -df copy.lz || fail=1
-		cmp in copy || fail=1
-		printf .
-		"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad${j}.lz "${testdir}"/test_bad${i}.lz || fail=1
-		"${LZIP}" -df copy.lz || fail=1
-		cmp in copy || fail=1
-		printf .
-	done
-done
-
-"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad3.lz "${testdir}"/test_bad4.lz "${testdir}"/test_bad5.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad4.lz "${testdir}"/test_bad5.lz "${testdir}"/test_bad3.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad5.lz "${testdir}"/test_bad3.lz "${testdir}"/test_bad4.lz || fail=1
-"${LZIP}" -df copy.lz || fail=1
-cmp in copy || fail=1
-printf .
-
 echo
 if [ ${fail} = 0 ] ; then
 	echo "tests completed successfully."