summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathis Rosenhauer <rosenhauer@dkrz.de>2016-08-18 11:26:33 (GMT)
committerMathis Rosenhauer <rosenhauer@dkrz.de>2016-09-12 07:46:42 (GMT)
commite3c56c9eac03ffef7098779fc5a9943e73e4052b (patch)
tree488adae0b066addddd55be1a9780f665052d3dd4
parent0caa53496d2e3097387ac5cf31a17e527ee71d09 (diff)
downloadlibaec-e3c56c9eac03ffef7098779fc5a9943e73e4052b.zip
libaec-e3c56c9eac03ffef7098779fc5a9943e73e4052b.tar.gz
libaec-e3c56c9eac03ffef7098779fc5a9943e73e4052b.tar.bz2
Ship test and benchmark data with dist
-rw-r--r--ChangeLog6
-rw-r--r--THANKS8
-rw-r--r--tests/Makefile.am5
-rwxr-xr-xtests/benc.sh17
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n01-restricted.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n01.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n02-restricted.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n02.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n03-restricted.rz1
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n03.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04-basic.rzbin0 -> 32 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rzbin0 -> 31 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n05.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n05.rzbin0 -> 45 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n06.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n06.rzbin0 -> 61 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n07.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n07.rzbin0 -> 78 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n08.datbin0 -> 256 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n08.rzbin0 -> 98 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n09.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n09.rzbin0 -> 121 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n10.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n10.rzbin0 -> 144 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n11.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n11.rzbin0 -> 170 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n12.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n12.rzbin0 -> 197 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n13.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n13.rzbin0 -> 227 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n14.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n14.rzbin0 -> 258 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n15.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n15.rzbin0 -> 291 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n16.datbin0 -> 512 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n16.rzbin0 -> 324 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n17.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n17.rzbin0 -> 368 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n18.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n18.rzbin0 -> 408 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n19.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n19.rzbin0 -> 449 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n20.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n20.rzbin0 -> 493 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n21.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n21.rzbin0 -> 539 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n22.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n22.rzbin0 -> 587 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n23.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n23.rzbin0 -> 636 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n24.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n24.rzbin0 -> 688 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n25.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n25.rzbin0 -> 742 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n26.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n26.rzbin0 -> 798 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n27.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n27.rzbin0 -> 855 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n28.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n28.rzbin0 -> 915 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n29.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n29.rzbin0 -> 977 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n30.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n30.rzbin0 -> 1040 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n31.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n31.rzbin0 -> 1105 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n32.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n32.rzbin0 -> 1170 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.datbin0 -> 1048576 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rzbin0 -> 863937 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rzbin0 -> 858515 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.datbin0 -> 432 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rzbin0 -> 21 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rzbin0 -> 18 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rzbin0 -> 33 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rzbin0 -> 34 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.datbin0 -> 1024 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rzbin0 -> 11 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rzbin0 -> 11 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rzbin0 -> 13 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rzbin0 -> 13 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rzbin0 -> 14 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.datbin0 -> 2048 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rzbin0 -> 8 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rzbin0 -> 12 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rzbin0 -> 12 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rzbin0 -> 12 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rzbin0 -> 12 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rzbin0 -> 13 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rzbin0 -> 13 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rzbin0 -> 13 bytes
-rw-r--r--tests/data/121B2TestData/README121BTest.docxbin0 -> 20313 bytes
-rw-r--r--tests/data/typical.rzbin0 -> 737024 bytes
-rwxr-xr-xtests/sampledata.sh20
-rwxr-xr-xtests/szcomp.sh2
118 files changed, 33 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index a00e4ab..4096283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
-2016-08-16 Mathis Rosenhauer <rosenhauer@dkrz.de>
+ Include CCSDS test data with libaec. See THANKS
Better compatibility with OSX for make check
Allow Cygwin to build DLLs
+2016-08-16 Mathis Rosenhauer <rosenhauer@dkrz.de>
+
v0.3.4
Pad incomplete last line when in SZ compatibility mode
@@ -14,7 +16,7 @@
Fixed bug with zero blocks in the last RSI (reference sample
interval) when data size is not a multiple of RSIs or segments (64
- blocks) and the zero region reaches a sement boundary.
+ blocks) and the zero region reaches a segment boundary.
Vectorization improvement for Intel compiler
diff --git a/THANKS b/THANKS
new file mode 100644
index 0000000..8cfbb0f
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,8 @@
+Thanks to the chairman of CCSDS SLS-MHDC, Aaron Kiely, to let us
+distribute BB121B2 test data with libaec. The data files are used
+during 'make check'.
+
+The most recent version of the data is available from the CCSDS web
+site:
+
+http://cwe.ccsds.org/sls/docs/Forms/AllItems.aspx?RootFolder=%2Fsls%2Fdocs%2FSLS%2DDC%2FBB121B2TestData&
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3cbc887..ea4285e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,11 +22,12 @@ check_szcomp_SOURCES = check_szcomp.c $(top_builddir)/src/szlib.h
LDADD = libcheck_aec.la $(top_builddir)/src/libaec.la
check_szcomp_LDADD = $(top_builddir)/src/libsz.la
-EXTRA_DIST = sampledata.sh szcomp.sh benc.sh bdec.sh CMakeLists.txt
+EXTRA_DIST = sampledata.sh szcomp.sh benc.sh bdec.sh CMakeLists.txt data
+
szcomp.log: sampledata.log
bench: benc bdec
benc:
- $(srcdir)/benc.sh
+ $(srcdir)/benc.sh $(srcdir)/data/typical.rz
bdec:
$(srcdir)/bdec.sh
.PHONY: bench benc bdec
diff --git a/tests/benc.sh b/tests/benc.sh
index dac0617..a8f6dc2 100755
--- a/tests/benc.sh
+++ b/tests/benc.sh
@@ -1,21 +1,10 @@
#!/bin/sh
set -e
+TEST_DATA=$1
AEC=../src/aec
-test_data=https://gitlab.dkrz.de/k202009/libaec/raw/master/data/typical.rz
-if [ ! -f typical.dat ]; then
- rm -f typical.rz
- type curl >/dev/null 2>&1 || {
- echo >&2 "curl not found. Please download $test_data by other means and place it in tests. Aborting."
- exit 1
- }
- curl $test_data -O || {
- echo >&2 "Could not download $test_data. Please download it by other means and place it in tests. Aborting."
- exit 1
- }
- $AEC -d -n16 -j64 -r256 -m typical.rz typical.dat
- rm -f bench.dat
-fi
if [ ! -f bench.dat ]; then
+ rm -f typical.dat
+ $AEC -d -n16 -j64 -r256 -m $TEST_DATA typical.dat
for i in $(seq 0 499);
do
cat typical.dat >> bench.dat
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz
new file mode 100644
index 0000000..855bd93
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz
@@ -0,0 +1 @@
+B" \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n01-restricted.rz b/tests/data/121B2TestData/AllOptions/test_p256n01-restricted.rz
new file mode 100644
index 0000000..63d03bd
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n01-restricted.rz
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n01.dat b/tests/data/121B2TestData/AllOptions/test_p256n01.dat
new file mode 100644
index 0000000..a08897e
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n01.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz
new file mode 100644
index 0000000..ce2dc07
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz
@@ -0,0 +1 @@
+KhVb@ \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n02-restricted.rz b/tests/data/121B2TestData/AllOptions/test_p256n02-restricted.rz
new file mode 100644
index 0000000..cd4cd41
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n02-restricted.rz
@@ -0,0 +1 @@
+-QE \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n02.dat b/tests/data/121B2TestData/AllOptions/test_p256n02.dat
new file mode 100644
index 0000000..e00e624
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n02.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz
new file mode 100644
index 0000000..44ca0b0
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz
@@ -0,0 +1 @@
+O,V|FͶ \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n03-restricted.rz b/tests/data/121B2TestData/AllOptions/test_p256n03-restricted.rz
new file mode 100644
index 0000000..e7a4065
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n03-restricted.rz
@@ -0,0 +1 @@
+ޞYZֵY6fm \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n03.dat b/tests/data/121B2TestData/AllOptions/test_p256n03.dat
new file mode 100644
index 0000000..1456bff
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n03.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz
new file mode 100644
index 0000000..7ac3f85
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz b/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz
new file mode 100644
index 0000000..4be8b50
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04.dat b/tests/data/121B2TestData/AllOptions/test_p256n04.dat
new file mode 100644
index 0000000..ce98d2a
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n04.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n05.dat b/tests/data/121B2TestData/AllOptions/test_p256n05.dat
new file mode 100644
index 0000000..0b85148
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n05.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n05.rz b/tests/data/121B2TestData/AllOptions/test_p256n05.rz
new file mode 100644
index 0000000..e156dee
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n05.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n06.dat b/tests/data/121B2TestData/AllOptions/test_p256n06.dat
new file mode 100644
index 0000000..77d40e3
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n06.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n06.rz b/tests/data/121B2TestData/AllOptions/test_p256n06.rz
new file mode 100644
index 0000000..2d74fc9
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n06.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n07.dat b/tests/data/121B2TestData/AllOptions/test_p256n07.dat
new file mode 100644
index 0000000..1d9983f
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n07.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n07.rz b/tests/data/121B2TestData/AllOptions/test_p256n07.rz
new file mode 100644
index 0000000..a6b8109
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n07.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n08.dat b/tests/data/121B2TestData/AllOptions/test_p256n08.dat
new file mode 100644
index 0000000..bd84e08
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n08.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n08.rz b/tests/data/121B2TestData/AllOptions/test_p256n08.rz
new file mode 100644
index 0000000..5787983
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n08.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n09.dat b/tests/data/121B2TestData/AllOptions/test_p256n09.dat
new file mode 100644
index 0000000..fcdd32b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n09.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n09.rz b/tests/data/121B2TestData/AllOptions/test_p256n09.rz
new file mode 100644
index 0000000..4cd81b4
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n09.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n10.dat b/tests/data/121B2TestData/AllOptions/test_p256n10.dat
new file mode 100644
index 0000000..cbe0d3d
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n10.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n10.rz b/tests/data/121B2TestData/AllOptions/test_p256n10.rz
new file mode 100644
index 0000000..5b2ac0b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n10.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n11.dat b/tests/data/121B2TestData/AllOptions/test_p256n11.dat
new file mode 100644
index 0000000..8edf225
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n11.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n11.rz b/tests/data/121B2TestData/AllOptions/test_p256n11.rz
new file mode 100644
index 0000000..7b2cca6
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n11.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n12.dat b/tests/data/121B2TestData/AllOptions/test_p256n12.dat
new file mode 100644
index 0000000..6e795f8
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n12.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n12.rz b/tests/data/121B2TestData/AllOptions/test_p256n12.rz
new file mode 100644
index 0000000..71e5ecf
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n12.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n13.dat b/tests/data/121B2TestData/AllOptions/test_p256n13.dat
new file mode 100644
index 0000000..60b600b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n13.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n13.rz b/tests/data/121B2TestData/AllOptions/test_p256n13.rz
new file mode 100644
index 0000000..a9c83aa
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n13.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n14.dat b/tests/data/121B2TestData/AllOptions/test_p256n14.dat
new file mode 100644
index 0000000..360d261
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n14.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n14.rz b/tests/data/121B2TestData/AllOptions/test_p256n14.rz
new file mode 100644
index 0000000..4fff9d9
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n14.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n15.dat b/tests/data/121B2TestData/AllOptions/test_p256n15.dat
new file mode 100644
index 0000000..ff09478
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n15.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n15.rz b/tests/data/121B2TestData/AllOptions/test_p256n15.rz
new file mode 100644
index 0000000..3831fb4
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n15.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n16.dat b/tests/data/121B2TestData/AllOptions/test_p256n16.dat
new file mode 100644
index 0000000..8b0d65f
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n16.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n16.rz b/tests/data/121B2TestData/AllOptions/test_p256n16.rz
new file mode 100644
index 0000000..3de1ae3
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p256n16.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n17.dat b/tests/data/121B2TestData/AllOptions/test_p512n17.dat
new file mode 100644
index 0000000..a03afd8
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n17.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n17.rz b/tests/data/121B2TestData/AllOptions/test_p512n17.rz
new file mode 100644
index 0000000..6826fd8
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n17.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n18.dat b/tests/data/121B2TestData/AllOptions/test_p512n18.dat
new file mode 100644
index 0000000..346427b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n18.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n18.rz b/tests/data/121B2TestData/AllOptions/test_p512n18.rz
new file mode 100644
index 0000000..6a6b98a
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n18.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n19.dat b/tests/data/121B2TestData/AllOptions/test_p512n19.dat
new file mode 100644
index 0000000..2f3ddcd
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n19.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n19.rz b/tests/data/121B2TestData/AllOptions/test_p512n19.rz
new file mode 100644
index 0000000..439eb87
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n19.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n20.dat b/tests/data/121B2TestData/AllOptions/test_p512n20.dat
new file mode 100644
index 0000000..9d90fe2
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n20.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n20.rz b/tests/data/121B2TestData/AllOptions/test_p512n20.rz
new file mode 100644
index 0000000..06d24cf
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n20.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n21.dat b/tests/data/121B2TestData/AllOptions/test_p512n21.dat
new file mode 100644
index 0000000..fbbe0a2
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n21.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n21.rz b/tests/data/121B2TestData/AllOptions/test_p512n21.rz
new file mode 100644
index 0000000..e485722
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n21.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n22.dat b/tests/data/121B2TestData/AllOptions/test_p512n22.dat
new file mode 100644
index 0000000..9bdffd9
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n22.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n22.rz b/tests/data/121B2TestData/AllOptions/test_p512n22.rz
new file mode 100644
index 0000000..72d7689
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n22.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n23.dat b/tests/data/121B2TestData/AllOptions/test_p512n23.dat
new file mode 100644
index 0000000..5c6711f
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n23.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n23.rz b/tests/data/121B2TestData/AllOptions/test_p512n23.rz
new file mode 100644
index 0000000..1b914ef
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n23.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n24.dat b/tests/data/121B2TestData/AllOptions/test_p512n24.dat
new file mode 100644
index 0000000..dc5490b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n24.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n24.rz b/tests/data/121B2TestData/AllOptions/test_p512n24.rz
new file mode 100644
index 0000000..dce838b
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n24.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n25.dat b/tests/data/121B2TestData/AllOptions/test_p512n25.dat
new file mode 100644
index 0000000..e0e2857
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n25.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n25.rz b/tests/data/121B2TestData/AllOptions/test_p512n25.rz
new file mode 100644
index 0000000..5b34c9c
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n25.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n26.dat b/tests/data/121B2TestData/AllOptions/test_p512n26.dat
new file mode 100644
index 0000000..d96f7c7
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n26.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n26.rz b/tests/data/121B2TestData/AllOptions/test_p512n26.rz
new file mode 100644
index 0000000..49ab8cc
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n26.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n27.dat b/tests/data/121B2TestData/AllOptions/test_p512n27.dat
new file mode 100644
index 0000000..13c6a21
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n27.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n27.rz b/tests/data/121B2TestData/AllOptions/test_p512n27.rz
new file mode 100644
index 0000000..bab17a3
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n27.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n28.dat b/tests/data/121B2TestData/AllOptions/test_p512n28.dat
new file mode 100644
index 0000000..28d347f
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n28.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n28.rz b/tests/data/121B2TestData/AllOptions/test_p512n28.rz
new file mode 100644
index 0000000..fecf151
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n28.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n29.dat b/tests/data/121B2TestData/AllOptions/test_p512n29.dat
new file mode 100644
index 0000000..ecea3a6
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n29.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n29.rz b/tests/data/121B2TestData/AllOptions/test_p512n29.rz
new file mode 100644
index 0000000..005552e
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n29.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n30.dat b/tests/data/121B2TestData/AllOptions/test_p512n30.dat
new file mode 100644
index 0000000..bd7301e
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n30.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n30.rz b/tests/data/121B2TestData/AllOptions/test_p512n30.rz
new file mode 100644
index 0000000..e29118d
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n30.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n31.dat b/tests/data/121B2TestData/AllOptions/test_p512n31.dat
new file mode 100644
index 0000000..9c37006
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n31.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n31.rz b/tests/data/121B2TestData/AllOptions/test_p512n31.rz
new file mode 100644
index 0000000..d77cbef
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n31.rz
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n32.dat b/tests/data/121B2TestData/AllOptions/test_p512n32.dat
new file mode 100644
index 0000000..b84bbff
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n32.dat
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n32.rz b/tests/data/121B2TestData/AllOptions/test_p512n32.rz
new file mode 100644
index 0000000..b1397b7
--- /dev/null
+++ b/tests/data/121B2TestData/AllOptions/test_p512n32.rz
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat b/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat
new file mode 100644
index 0000000..ddf74d0
--- /dev/null
+++ b/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz
new file mode 100644
index 0000000..b89659d
--- /dev/null
+++ b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz
new file mode 100644
index 0000000..0c4ab28
--- /dev/null
+++ b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat
new file mode 100644
index 0000000..22ea0f3
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rz
new file mode 100644
index 0000000..c3ba347
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rz
new file mode 100644
index 0000000..94751e8
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rz
new file mode 100644
index 0000000..f5764e0
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz
new file mode 100644
index 0000000..3736d43
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz
@@ -0,0 +1 @@
+ UUUTjUUUUj \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rz
new file mode 100644
index 0000000..03ffd5c
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz
new file mode 100644
index 0000000..af535f2
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz
@@ -0,0 +1 @@
+UUUUUUUUUUUUPUUUU \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rz
new file mode 100644
index 0000000..a024ee3
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz
new file mode 100644
index 0000000..e4ca921
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz
@@ -0,0 +1 @@
+UUUUBUUUU@* \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rz
new file mode 100644
index 0000000..8bc886d
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz
new file mode 100644
index 0000000..2238e0e
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz
new file mode 100644
index 0000000..0a452d9
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz
new file mode 100644
index 0000000..82c483b
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat
new file mode 100644
index 0000000..141f545
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rz
new file mode 100644
index 0000000..cde6ee4
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rz
new file mode 100644
index 0000000..05a3432
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rz
new file mode 100644
index 0000000..e0cc84d
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rz
new file mode 100644
index 0000000..1cccf0a
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rz
new file mode 100644
index 0000000..05f40f7
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rz
new file mode 100644
index 0000000..fd94714
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rz
new file mode 100644
index 0000000..899a8c9
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rz
new file mode 100644
index 0000000..519d82a
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz
new file mode 100644
index 0000000..774d180
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz
new file mode 100644
index 0000000..b900f28
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz
new file mode 100644
index 0000000..f5c3cea
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz
new file mode 100644
index 0000000..34f0ec0
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat
new file mode 100644
index 0000000..37f69d2
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rz
new file mode 100644
index 0000000..2262aca
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz
new file mode 100644
index 0000000..dabae82
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rz
new file mode 100644
index 0000000..43f03ee
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz
new file mode 100644
index 0000000..42fead7
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz
@@ -0,0 +1 @@
+UUU@@ \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rz
new file mode 100644
index 0000000..baf899d
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz
new file mode 100644
index 0000000..4210bb6
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz
@@ -0,0 +1 @@
+J \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rz
new file mode 100644
index 0000000..488b09e
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rz
new file mode 100644
index 0000000..d99a350
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz
new file mode 100644
index 0000000..2e8d74f
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz
@@ -0,0 +1 @@
+!UUUT@ \ No newline at end of file
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rz
new file mode 100644
index 0000000..0302613
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz
new file mode 100644
index 0000000..d56b761
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz
new file mode 100644
index 0000000..81125dd
--- /dev/null
+++ b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz
Binary files differ
diff --git a/tests/data/121B2TestData/README121BTest.docx b/tests/data/121B2TestData/README121BTest.docx
new file mode 100644
index 0000000..72f8034
--- /dev/null
+++ b/tests/data/121B2TestData/README121BTest.docx
Binary files differ
diff --git a/tests/data/typical.rz b/tests/data/typical.rz
new file mode 100644
index 0000000..fc1e827
--- /dev/null
+++ b/tests/data/typical.rz
Binary files differ
diff --git a/tests/sampledata.sh b/tests/sampledata.sh
index 9296dab..12649a4 100755
--- a/tests/sampledata.sh
+++ b/tests/sampledata.sh
@@ -1,27 +1,10 @@
#!/bin/sh
set -e
AEC=../src/aec
-CCSDS_DATA=121B2TestData
+CCSDS_DATA=${srcdir}/data/121B2TestData
ALLO=${CCSDS_DATA}/AllOptions
EXTP=${CCSDS_DATA}/ExtendedParameters
LOWE=${CCSDS_DATA}/LowEntropyOptions
-archive=121B2TestData.zip
-archive_url=http://cwe.ccsds.org/sls/docs/SLS-DC/BB121B2TestData/$archive
-if [ ! -f $archive ]; then
- type curl >/dev/null 2>&1 || {
- echo >&2 "curl not found. Please download $archive_url by other means and place it in tests.\nAborting."
- exit 1
- }
- curl $archive_url -O || {
- echo >&2 "Could not download $archive_url. Please download $archive by other means and place it in tests. Aborting."
- exit 1
- }
-fi
-type unzip >/dev/null 2>&1 || {
- echo >&2 "unzip not found. Please install unzip or unpack $archive in tests.\nAborting."
- exit 1
-}
-unzip -oq $archive
filesize () {
wc -c $1 | awk '{print $1}'
@@ -56,7 +39,6 @@ cosdec () {
}
echo All Options
-mv -f ${ALLO}/test_P512n22.dat ${ALLO}/test_p512n22.dat
for i in 01 02 03 04
do
uf=$ALLO/test_p256n${i}.dat
diff --git a/tests/szcomp.sh b/tests/szcomp.sh
index 6335835..e9a3095 100755
--- a/tests/szcomp.sh
+++ b/tests/szcomp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
-testfile=121B2TestData/ExtendedParameters/sar32bit.dat
+testfile=${srcdir}/data/121B2TestData/ExtendedParameters/sar32bit.dat
if [ ! -f $testfile ]; then
echo "ERROR: sample data not found."
exit -1