From 4256d9a69e8bc3923dc23de1eac87245a749cbf4 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 25 Jan 2021 14:41:07 +0100
Subject: Merging upstream version 1.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 testsuite/check.sh       |  32 ++++++++++++++++++++++++++++----
 testsuite/fox.lz         | Bin 0 -> 80 bytes
 testsuite/fox_bcrc.lz    | Bin 0 -> 80 bytes
 testsuite/fox_bm.lz      | Bin 0 -> 80 bytes
 testsuite/fox_crc0.lz    | Bin 0 -> 80 bytes
 testsuite/fox_das46.lz   | Bin 0 -> 80 bytes
 testsuite/fox_de20.lz    | Bin 0 -> 80 bytes
 testsuite/fox_mes81.lz   | Bin 0 -> 80 bytes
 testsuite/fox_s11.lz     | Bin 0 -> 80 bytes
 testsuite/fox_v2.lz      | Bin 0 -> 80 bytes
 testsuite/test_em.txt.lz | Bin 0 -> 14024 bytes
 11 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 testsuite/fox.lz
 create mode 100644 testsuite/fox_bcrc.lz
 create mode 100644 testsuite/fox_bm.lz
 create mode 100644 testsuite/fox_crc0.lz
 create mode 100644 testsuite/fox_das46.lz
 create mode 100644 testsuite/fox_de20.lz
 create mode 100644 testsuite/fox_mes81.lz
 create mode 100644 testsuite/fox_s11.lz
 create mode 100644 testsuite/fox_v2.lz
 create mode 100644 testsuite/test_em.txt.lz

(limited to 'testsuite')

diff --git a/testsuite/check.sh b/testsuite/check.sh
index eb83163..c1f86e6 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # check script for Lzd - Educational decompressor for the lzip format
-# Copyright (C) 2013-2019 Antonio Diaz Diaz.
+# Copyright (C) 2013-2021 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
@@ -30,6 +30,8 @@ cd "${objdir}"/tmp || framework_failure
 
 in="${testdir}"/test.txt
 in_lz="${testdir}"/test.txt.lz
+in_em="${testdir}"/test_em.txt.lz
+fox_lz="${testdir}"/fox.lz
 fail=0
 test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 
@@ -38,16 +40,38 @@ printf "testing lzd-%s..." "$2"
 "${LZIP}" < "${in}" 2> /dev/null
 [ $? = 2 ] || test_failed $LINENO
 
-"${LZIP}" < "${in_lz}" > copy || test_failed $LINENO
-cmp "${in}" copy || test_failed $LINENO
+for i in "${in_lz}" "${in_em}" ; do
+	"${LZIP}" < "$i" > copy || test_failed $LINENO "$i"
+	cmp "${in}" copy || test_failed $LINENO "$i"
+done
 
 cat "${in}" "${in}" > in2 || framework_failure
 cat "${in_lz}" "${in_lz}" > in2.lz || framework_failure
 "${LZIP}" < in2.lz > copy2 || test_failed $LINENO
 cmp in2 copy2 || test_failed $LINENO
 
+cat in2.lz > copy2.lz || framework_failure
+printf "\ngarbage" >> copy2.lz || framework_failure
+"${LZIP}" -d < copy2.lz > copy2 || test_failed $LINENO
+cmp in2 copy2 || test_failed $LINENO
+rm -f in2 copy2 copy2.lz || framework_failure
+
 printf "\ntesting bad input..."
 
+for i in fox_bm.lz fox_v2.lz fox_s11.lz fox_de20.lz \
+         fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
+	"${LZIP}" < "${testdir}"/$i > /dev/null 2>&1
+	[ $? = 2 ] || test_failed $LINENO $i
+done
+
+"${LZIP}" < "${fox_lz}" > fox || test_failed $LINENO
+for i in fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do
+	"${LZIP}" < "${testdir}"/$i > out 2> /dev/null
+	[ $? = 2 ] || test_failed $LINENO $i
+	cmp fox out || test_failed $LINENO $i
+done
+rm -f fox out || 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
diff --git a/testsuite/fox.lz b/testsuite/fox.lz
new file mode 100644
index 0000000..509da82
Binary files /dev/null and b/testsuite/fox.lz differ
diff --git a/testsuite/fox_bcrc.lz b/testsuite/fox_bcrc.lz
new file mode 100644
index 0000000..8f6a7c4
Binary files /dev/null and b/testsuite/fox_bcrc.lz differ
diff --git a/testsuite/fox_bm.lz b/testsuite/fox_bm.lz
new file mode 100644
index 0000000..d71914f
Binary files /dev/null and b/testsuite/fox_bm.lz differ
diff --git a/testsuite/fox_crc0.lz b/testsuite/fox_crc0.lz
new file mode 100644
index 0000000..1abe926
Binary files /dev/null and b/testsuite/fox_crc0.lz differ
diff --git a/testsuite/fox_das46.lz b/testsuite/fox_das46.lz
new file mode 100644
index 0000000..43ed9f9
Binary files /dev/null and b/testsuite/fox_das46.lz differ
diff --git a/testsuite/fox_de20.lz b/testsuite/fox_de20.lz
new file mode 100644
index 0000000..10949d8
Binary files /dev/null and b/testsuite/fox_de20.lz differ
diff --git a/testsuite/fox_mes81.lz b/testsuite/fox_mes81.lz
new file mode 100644
index 0000000..d50ef2e
Binary files /dev/null and b/testsuite/fox_mes81.lz differ
diff --git a/testsuite/fox_s11.lz b/testsuite/fox_s11.lz
new file mode 100644
index 0000000..dca909c
Binary files /dev/null and b/testsuite/fox_s11.lz differ
diff --git a/testsuite/fox_v2.lz b/testsuite/fox_v2.lz
new file mode 100644
index 0000000..8620981
Binary files /dev/null and b/testsuite/fox_v2.lz differ
diff --git a/testsuite/test_em.txt.lz b/testsuite/test_em.txt.lz
new file mode 100644
index 0000000..7e96250
Binary files /dev/null and b/testsuite/test_em.txt.lz differ
-- 
cgit v1.2.3