From 04d72dd06c3c49fcc61e5ae7b8cee112d34e8df1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 12:42:39 +0100
Subject: Merging upstream version 1.15~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 testsuite/check.sh | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'testsuite/check.sh')

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 4ac7f59..314c19e 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# check script for Lziprecover - Data recovery tool for lzipped files
+# check script for Lziprecover - Data recovery tool for lzip files
 # Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
@@ -10,7 +10,7 @@ export LC_ALL
 objdir=`pwd`
 testdir=`cd "$1" ; pwd`
 LZIP="${objdir}"/lziprecover
-LZIPRECOVER="${objdir}"/lziprecover
+LZIPRECOVER="${LZIP}"
 framework_failure() { echo "failure in testing framework" ; exit 1 ; }
 
 if [ ! -x "${LZIP}" ] ; then
@@ -65,9 +65,21 @@ if [ $? = 1 ] ; then printf . ; else fail=1 ; printf - ; fi
 if [ $? = 1 ] ; then printf . ; else fail=1 ; printf - ; fi
 "${LZIPRECOVER}" -sq
 if [ $? = 1 ] ; then printf . ; else fail=1 ; printf - ; fi
-
-"${LZIP}" -t "${testdir}"/test.txt.lz || fail=1
-"${LZIP}" -cd "${testdir}"/test.txt.lz > copy || fail=1
+"${LZIP}" -tq "${in}"
+if [ $? = 2 ] ; then printf . ; else fail=1 ; printf - ; fi
+"${LZIP}" -tq < "${in}"
+if [ $? = 2 ] ; then printf . ; else fail=1 ; printf - ; fi
+"${LZIP}" -cdq "${in}"
+if [ $? = 2 ] ; then printf . ; else fail=1 ; printf - ; fi
+"${LZIP}" -cdq < "${in}"
+if [ $? = 2 ] ; then printf . ; else fail=1 ; printf - ; 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
+
+"${LZIP}" -t "${in_lz}" || fail=1
+"${LZIP}" -cd "${in_lz}" > copy || fail=1
 cmp "${in}" copy || fail=1
 printf .
 
@@ -100,8 +112,8 @@ for i in "${f5b1_lz}" "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" ; do
 	cmp "${fox5_lz}" copy.lz || fail=1
 	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f5b2_lz}" || fail=1
 	cmp "${fox5_lz}" copy.lz || fail=1
-	printf .
 done
+printf .
 
 for i in "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" ; do
 	"${LZIPRECOVER}" -mf -o copy.lz "${f5b1_lz}" "${f5b2_lz}" "${i}" || fail=1
@@ -116,8 +128,8 @@ for i in "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" ; do
 	cmp "${fox5_lz}" copy.lz || fail=1
 	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f5b2_lz}" "${f5b1_lz}" || fail=1
 	cmp "${fox5_lz}" copy.lz || fail=1
-	printf .
 done
+printf .
 
 "${LZIPRECOVER}" -mf -o copy.lz "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" || fail=1
 cmp "${fox5_lz}" copy.lz || fail=1
@@ -141,9 +153,9 @@ for i in "${bad1_lz}" "${bad2_lz}" ; do
 		cmp "${in_lz}" copy.lz || fail=1
 		"${LZIPRECOVER}" -mf -o copy.lz "${j}" "${i}" || fail=1
 		cmp "${in_lz}" copy.lz || fail=1
-		printf .
 	done
 done
+printf .
 
 "${LZIPRECOVER}" -mf -o copy.lz "${bad3_lz}" "${bad4_lz}" "${bad5_lz}" || fail=1
 cmp "${in_lz}" copy.lz || fail=1
@@ -171,7 +183,6 @@ if [ $? = 0 ] && [ ! -e copy.lz ] ; then printf . ; else fail=1 ; printf - ; fi
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else fail=1 ; printf - ; fi
 "${LZIPRECOVER}" -Rf -o copy.lz "${f5b1_lz}" || fail=1
 cmp "${fox5_lz}" copy.lz || fail=1
-printf .
 "${LZIPRECOVER}" -Rf -o copy.lz "${bad1_lz}" || fail=1
 cmp "${in_lz}" copy.lz || fail=1
 printf .
@@ -182,8 +193,8 @@ printf "garbage" >> copy || fail=1
 for i in 1 2 3 ; do
 	"${LZIPRECOVER}" -cd rec${i}copy.lz > copy || fail=1
 	cmp "${in}" copy || fail=1
-	printf .
 done
+printf .
 
 cat "${in_lz}" > anyothername || framework_failure
 "${LZIP}" -d anyothername || fail=1
@@ -191,8 +202,7 @@ cmp "${in}" anyothername.out || fail=1
 printf .
 
 cat "${in}" "${in}" > in2 || framework_failure
-cat "${in_lz}" "${in_lz}" > out2 || framework_failure
-"${LZIP}" -d < out2 > copy2 || fail=1
+cat "${in_lz}" "${in_lz}" | "${LZIP}" -d > copy2 || fail=1
 cmp in2 copy2 || fail=1
 printf .
 
-- 
cgit v1.2.3