summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathis Rosenhauer <rosenhauer@dkrz.de>2016-09-13 10:05:39 (GMT)
committerMathis Rosenhauer <rosenhauer@dkrz.de>2016-09-14 10:30:38 (GMT)
commit97331a0147be4626e9e73fda60961b333d72e6e6 (patch)
tree2f063b6abada96f855bdead9daff580d59a9271a
parente3c56c9eac03ffef7098779fc5a9943e73e4052b (diff)
downloadlibaec-97331a0147be4626e9e73fda60961b333d72e6e6.zip
libaec-97331a0147be4626e9e73fda60961b333d72e6e6.tar.gz
libaec-97331a0147be4626e9e73fda60961b333d72e6e6.tar.bz2
Remove sample data from repo
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am19
-rw-r--r--THANKS8
-rw-r--r--configure.ac1
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/Makefile.am9
-rwxr-xr-xsrc/bdec.sh (renamed from tests/bdec.sh)8
-rwxr-xr-xsrc/benc.sh (renamed from tests/benc.sh)5
-rw-r--r--tests/CMakeLists.txt33
-rw-r--r--tests/Makefile.am9
-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.datbin256 -> 0 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.datbin256 -> 0 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.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04-basic.rzbin32 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rzbin31 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n04.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n05.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n05.rzbin45 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n06.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n06.rzbin61 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n07.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n07.rzbin78 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n08.datbin256 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n08.rzbin98 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n09.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n09.rzbin121 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n10.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n10.rzbin144 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n11.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n11.rzbin170 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n12.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n12.rzbin197 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n13.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n13.rzbin227 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n14.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n14.rzbin258 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n15.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n15.rzbin291 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n16.datbin512 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p256n16.rzbin324 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n17.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n17.rzbin368 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n18.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n18.rzbin408 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n19.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n19.rzbin449 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n20.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n20.rzbin493 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n21.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n21.rzbin539 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n22.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n22.rzbin587 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n23.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n23.rzbin636 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n24.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n24.rzbin688 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n25.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n25.rzbin742 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n26.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n26.rzbin798 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n27.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n27.rzbin855 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n28.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n28.rzbin915 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n29.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n29.rzbin977 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n30.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n30.rzbin1040 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n31.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n31.rzbin1105 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n32.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/AllOptions/test_p512n32.rzbin1170 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.datbin1048576 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rzbin863937 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rzbin858515 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.datbin432 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rzbin21 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rzbin18 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rzbin33 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rzbin34 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.datbin1024 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rzbin11 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rzbin11 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rzbin13 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rzbin13 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rzbin14 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.datbin2048 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rzbin8 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rzbin12 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rzbin12 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rzbin12 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rzbin12 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz1
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rzbin13 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rzbin13 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rzbin13 -> 0 bytes
-rw-r--r--tests/data/121B2TestData/README121BTest.docxbin20313 -> 0 bytes
-rw-r--r--tests/data/typical.rzbin737024 -> 0 bytes
-rwxr-xr-xtests/sampledata.sh5
-rwxr-xr-xtests/szcomp.sh2
124 files changed, 62 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore
index ff4e7ca..254bdbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ libtool
autom4te.cache
.DS_Store
build*
+data/121B2TestData
diff --git a/Makefile.am b/Makefile.am
index 08c63a1..58c6899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,15 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src tests
EXTRA_DIST = doc/license.txt CMakeLists.txt cmake/config.h.in \
-cmake/macros.cmake README.SZIP Copyright.txt
+cmake/macros.cmake README.SZIP Copyright.txt data
-bench: all
- cd tests && $(MAKE) $(AM_MAKEFLAGS) bench
-benc: all
- cd tests && $(MAKE) $(AM_MAKEFLAGS) benc
-bdec: all
- cd tests && $(MAKE) $(AM_MAKEFLAGS) bdec
-.PHONY: bench benc bdec
+sampledata = 121B2TestData
+sampledata_url = http://cwe.ccsds.org/sls/docs/SLS-DC/BB121B2TestData/$(sampledata).zip
+update-sampledata:
+ cd $(srcdir)/data && \
+ rm -rf $(sampledata) && \
+ curl $(sampledata_url) -O && unzip $(sampledata).zip && \
+ rm -f $(sampledata).zip && \
+ cd $(sampledata)/AllOptions && mv -f test_P512n22.dat test_p512n22.dat
+
+.PHONY: update-sampledata
diff --git a/THANKS b/THANKS
index 8cfbb0f..8281b0c 100644
--- a/THANKS
+++ b/THANKS
@@ -1,3 +1,7 @@
+**********************************************************************
+ CCSDS sample data for libaec testing
+**********************************************************************
+
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'.
@@ -6,3 +10,7 @@ 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&
+
+You can also update the data included in the distribution with
+
+ make update-sampledata
diff --git a/configure.ac b/configure.ac
index 65b6a8d..c044112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_C_RESTRICT
AC_CHECK_FUNCS([memset strstr])
AC_CHECK_DECLS(__builtin_clzll)
+AM_EXTRA_RECURSIVE_TARGETS([bench benc bdec])
AC_CONFIG_FILES([Makefile \
src/Makefile \
tests/Makefile])
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be9ec35..66a04b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,11 @@ TARGET_LINK_LIBRARIES(aec_client aec)
IF(UNIX)
ADD_EXECUTABLE(utime EXCLUDE_FROM_ALL utime.c)
+ ADD_CUSTOM_TARGET(bench
+ COMMAND ${CMAKE_SOURCE_DIR}/src/benc.sh ${CMAKE_SOURCE_DIR}/data/typical.rz
+ COMMAND ${CMAKE_SOURCE_DIR}/src/bdec.sh
+ DEPENDS aec_client utime
+ )
ENDIF(UNIX)
IF(WIN32)
diff --git a/src/Makefile.am b/src/Makefile.am
index e2a2d44..0374d91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,4 +15,11 @@ utime_SOURCES = utime.c
aec_LDADD = libaec.la
aec_SOURCES = aec.c
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST = CMakeLists.txt benc.sh bdec.sh
+CLEANFILES = bench.dat bench.rz
+
+bench-local: all benc bdec
+benc-local: all
+ $(srcdir)/benc.sh $(top_srcdir)/data/typical.rz
+bdec-local: all
+ top_srcdir=$(top_srcdir) $(srcdir)/bdec.sh
diff --git a/tests/bdec.sh b/src/bdec.sh
index 99d7136..10da618 100755
--- a/tests/bdec.sh
+++ b/src/bdec.sh
@@ -1,15 +1,13 @@
#!/bin/sh
set -e
-AEC=../src/aec
-
if [ ! -f bench.rz ]; then
echo "No encoded file found. Encoding now..."
- path=$(echo $0 | sed -e 's:[^/]*$::')
- "${path}"/benc.sh
+ ${top_srcdir}/src/benc.sh ${top_srcdir}/data/typical.rz
fi
rm -f dec.dat
bsize=$(wc -c bench.dat | awk '{print $1}')
-utime=$(../src/utime $AEC -d -n16 -j64 -r256 -m bench.rz dec.dat 2>&1)
+utime=$(./utime ./aec -d -n16 -j64 -r256 -m bench.rz dec.dat 2>&1)
perf=$(echo "$bsize/1048576/$utime" | bc)
echo "*** Decoding with $perf MiB/s user time ***"
cmp bench.dat dec.dat
+rm -f dec.dat
diff --git a/tests/benc.sh b/src/benc.sh
index a8f6dc2..e2f8075 100755
--- a/tests/benc.sh
+++ b/src/benc.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
TEST_DATA=$1
-AEC=../src/aec
+AEC=./aec
if [ ! -f bench.dat ]; then
rm -f typical.dat
$AEC -d -n16 -j64 -r256 -m $TEST_DATA typical.dat
@@ -9,9 +9,10 @@ if [ ! -f bench.dat ]; then
do
cat typical.dat >> bench.dat
done
+ rm -f typical.dat
fi
rm -f bench.rz
-utime=$(../src/utime $AEC -n16 -j64 -r256 -m bench.dat bench.rz 2>&1)
+utime=$(./utime $AEC -n16 -j64 -r256 -m bench.dat bench.rz 2>&1)
bsize=$(wc -c bench.dat | awk '{print $1}')
perf=$(echo "$bsize/1048576/$utime" | bc)
echo "*** Encoding with $perf MiB/s user time ***"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 15b9433..c509451 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
ADD_LIBRARY(check_aec STATIC check_aec.c)
-TARGET_LINK_LIBRARIES(check_aec aec)
ADD_EXECUTABLE(check_code_options check_code_options.c)
TARGET_LINK_LIBRARIES(check_code_options check_aec aec)
@@ -7,23 +6,21 @@ TARGET_LINK_LIBRARIES(check_code_options check_aec aec)
ADD_EXECUTABLE(check_buffer_sizes check_buffer_sizes.c)
TARGET_LINK_LIBRARIES(check_buffer_sizes check_aec aec)
-ADD_EXECUTABLE(check_long_fs check_long_fs.c)
-TARGET_LINK_LIBRARIES(check_long_fs check_aec aec)
-
-ADD_TEST(check_code_options check_code_options)
-ADD_TEST(check_buffer_sizes check_buffer_sizes)
-ADD_TEST(check_long_fs check_long_fs)
-
-ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
-ADD_DEPENDENCIES(check
- check_code_options
- check_buffer_sizes
- check_long_fs)
-
+ADD_TEST(NAME check_code_options COMMAND check_code_options)
+ADD_TEST(NAME check_buffer_sizes COMMAND check_buffer_sizes)
IF(UNIX)
- ADD_CUSTOM_TARGET(bench
- COMMAND ${CMAKE_SOURCE_DIR}/tests/benc.sh
- COMMAND ${CMAKE_SOURCE_DIR}/tests/bdec.sh
- DEPENDS aec_client utime
+ ADD_EXECUTABLE(check_long_fs check_long_fs.c)
+ TARGET_LINK_LIBRARIES(check_long_fs check_aec aec)
+ ADD_TEST(NAME check_long_fs COMMAND check_long_fs)
+ ADD_TEST(
+ NAME sampledata.sh
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sampledata.sh ${CMAKE_CURRENT_SOURCE_DIR}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ ADD_EXECUTABLE(check_szcomp check_szcomp.c)
+ TARGET_LINK_LIBRARIES(check_szcomp check_aec sz)
+ ADD_TEST(
+ NAME check_szcomp
+ COMMAND check_szcomp ${CMAKE_CURRENT_SOURCE_DIR}/../data/121B2TestData/ExtendedParameters/sar32bit.dat
)
ENDIF(UNIX)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea4285e..8829293 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
TESTS = check_code_options check_buffer_sizes check_long_fs \
szcomp.sh sampledata.sh
TEST_EXTENSIONS = .sh
+CLEANFILES = test.dat test.rz
check_LTLIBRARIES = libcheck_aec.la
libcheck_aec_la_SOURCES = check_aec.c check_aec.h
check_PROGRAMS = check_code_options check_buffer_sizes check_long_fs \
@@ -22,12 +23,6 @@ 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 data
+EXTRA_DIST = sampledata.sh szcomp.sh CMakeLists.txt
szcomp.log: sampledata.log
-bench: benc bdec
-benc:
- $(srcdir)/benc.sh $(srcdir)/data/typical.rz
-bdec:
- $(srcdir)/bdec.sh
-.PHONY: bench benc bdec
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz
deleted file mode 100644
index 855bd93..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n01-basic.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 63d03bd..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n01-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n01.dat b/tests/data/121B2TestData/AllOptions/test_p256n01.dat
deleted file mode 100644
index a08897e..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n01.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz
deleted file mode 100644
index ce2dc07..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n02-basic.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index cd4cd41..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n02-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
--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
deleted file mode 100644
index e00e624..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n02.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz
deleted file mode 100644
index 44ca0b0..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n03-basic.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index e7a4065..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n03-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
-ޞ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
deleted file mode 100644
index 1456bff..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n03.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz b/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz
deleted file mode 100644
index 7ac3f85..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n04-basic.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz b/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz
deleted file mode 100644
index 4be8b50..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n04-restricted.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n04.dat b/tests/data/121B2TestData/AllOptions/test_p256n04.dat
deleted file mode 100644
index ce98d2a..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n04.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n05.dat b/tests/data/121B2TestData/AllOptions/test_p256n05.dat
deleted file mode 100644
index 0b85148..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n05.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n05.rz b/tests/data/121B2TestData/AllOptions/test_p256n05.rz
deleted file mode 100644
index e156dee..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n05.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n06.dat b/tests/data/121B2TestData/AllOptions/test_p256n06.dat
deleted file mode 100644
index 77d40e3..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n06.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n06.rz b/tests/data/121B2TestData/AllOptions/test_p256n06.rz
deleted file mode 100644
index 2d74fc9..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n06.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n07.dat b/tests/data/121B2TestData/AllOptions/test_p256n07.dat
deleted file mode 100644
index 1d9983f..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n07.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n07.rz b/tests/data/121B2TestData/AllOptions/test_p256n07.rz
deleted file mode 100644
index a6b8109..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n07.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n08.dat b/tests/data/121B2TestData/AllOptions/test_p256n08.dat
deleted file mode 100644
index bd84e08..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n08.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n08.rz b/tests/data/121B2TestData/AllOptions/test_p256n08.rz
deleted file mode 100644
index 5787983..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n08.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n09.dat b/tests/data/121B2TestData/AllOptions/test_p256n09.dat
deleted file mode 100644
index fcdd32b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n09.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n09.rz b/tests/data/121B2TestData/AllOptions/test_p256n09.rz
deleted file mode 100644
index 4cd81b4..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n09.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n10.dat b/tests/data/121B2TestData/AllOptions/test_p256n10.dat
deleted file mode 100644
index cbe0d3d..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n10.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n10.rz b/tests/data/121B2TestData/AllOptions/test_p256n10.rz
deleted file mode 100644
index 5b2ac0b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n10.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n11.dat b/tests/data/121B2TestData/AllOptions/test_p256n11.dat
deleted file mode 100644
index 8edf225..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n11.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n11.rz b/tests/data/121B2TestData/AllOptions/test_p256n11.rz
deleted file mode 100644
index 7b2cca6..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n11.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n12.dat b/tests/data/121B2TestData/AllOptions/test_p256n12.dat
deleted file mode 100644
index 6e795f8..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n12.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n12.rz b/tests/data/121B2TestData/AllOptions/test_p256n12.rz
deleted file mode 100644
index 71e5ecf..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n12.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n13.dat b/tests/data/121B2TestData/AllOptions/test_p256n13.dat
deleted file mode 100644
index 60b600b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n13.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n13.rz b/tests/data/121B2TestData/AllOptions/test_p256n13.rz
deleted file mode 100644
index a9c83aa..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n13.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n14.dat b/tests/data/121B2TestData/AllOptions/test_p256n14.dat
deleted file mode 100644
index 360d261..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n14.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n14.rz b/tests/data/121B2TestData/AllOptions/test_p256n14.rz
deleted file mode 100644
index 4fff9d9..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n14.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n15.dat b/tests/data/121B2TestData/AllOptions/test_p256n15.dat
deleted file mode 100644
index ff09478..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n15.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n15.rz b/tests/data/121B2TestData/AllOptions/test_p256n15.rz
deleted file mode 100644
index 3831fb4..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n15.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n16.dat b/tests/data/121B2TestData/AllOptions/test_p256n16.dat
deleted file mode 100644
index 8b0d65f..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n16.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p256n16.rz b/tests/data/121B2TestData/AllOptions/test_p256n16.rz
deleted file mode 100644
index 3de1ae3..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p256n16.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n17.dat b/tests/data/121B2TestData/AllOptions/test_p512n17.dat
deleted file mode 100644
index a03afd8..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n17.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n17.rz b/tests/data/121B2TestData/AllOptions/test_p512n17.rz
deleted file mode 100644
index 6826fd8..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n17.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n18.dat b/tests/data/121B2TestData/AllOptions/test_p512n18.dat
deleted file mode 100644
index 346427b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n18.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n18.rz b/tests/data/121B2TestData/AllOptions/test_p512n18.rz
deleted file mode 100644
index 6a6b98a..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n18.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n19.dat b/tests/data/121B2TestData/AllOptions/test_p512n19.dat
deleted file mode 100644
index 2f3ddcd..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n19.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n19.rz b/tests/data/121B2TestData/AllOptions/test_p512n19.rz
deleted file mode 100644
index 439eb87..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n19.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n20.dat b/tests/data/121B2TestData/AllOptions/test_p512n20.dat
deleted file mode 100644
index 9d90fe2..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n20.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n20.rz b/tests/data/121B2TestData/AllOptions/test_p512n20.rz
deleted file mode 100644
index 06d24cf..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n20.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n21.dat b/tests/data/121B2TestData/AllOptions/test_p512n21.dat
deleted file mode 100644
index fbbe0a2..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n21.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n21.rz b/tests/data/121B2TestData/AllOptions/test_p512n21.rz
deleted file mode 100644
index e485722..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n21.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n22.dat b/tests/data/121B2TestData/AllOptions/test_p512n22.dat
deleted file mode 100644
index 9bdffd9..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n22.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n22.rz b/tests/data/121B2TestData/AllOptions/test_p512n22.rz
deleted file mode 100644
index 72d7689..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n22.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n23.dat b/tests/data/121B2TestData/AllOptions/test_p512n23.dat
deleted file mode 100644
index 5c6711f..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n23.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n23.rz b/tests/data/121B2TestData/AllOptions/test_p512n23.rz
deleted file mode 100644
index 1b914ef..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n23.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n24.dat b/tests/data/121B2TestData/AllOptions/test_p512n24.dat
deleted file mode 100644
index dc5490b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n24.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n24.rz b/tests/data/121B2TestData/AllOptions/test_p512n24.rz
deleted file mode 100644
index dce838b..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n24.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n25.dat b/tests/data/121B2TestData/AllOptions/test_p512n25.dat
deleted file mode 100644
index e0e2857..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n25.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n25.rz b/tests/data/121B2TestData/AllOptions/test_p512n25.rz
deleted file mode 100644
index 5b34c9c..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n25.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n26.dat b/tests/data/121B2TestData/AllOptions/test_p512n26.dat
deleted file mode 100644
index d96f7c7..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n26.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n26.rz b/tests/data/121B2TestData/AllOptions/test_p512n26.rz
deleted file mode 100644
index 49ab8cc..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n26.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n27.dat b/tests/data/121B2TestData/AllOptions/test_p512n27.dat
deleted file mode 100644
index 13c6a21..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n27.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n27.rz b/tests/data/121B2TestData/AllOptions/test_p512n27.rz
deleted file mode 100644
index bab17a3..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n27.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n28.dat b/tests/data/121B2TestData/AllOptions/test_p512n28.dat
deleted file mode 100644
index 28d347f..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n28.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n28.rz b/tests/data/121B2TestData/AllOptions/test_p512n28.rz
deleted file mode 100644
index fecf151..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n28.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n29.dat b/tests/data/121B2TestData/AllOptions/test_p512n29.dat
deleted file mode 100644
index ecea3a6..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n29.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n29.rz b/tests/data/121B2TestData/AllOptions/test_p512n29.rz
deleted file mode 100644
index 005552e..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n29.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n30.dat b/tests/data/121B2TestData/AllOptions/test_p512n30.dat
deleted file mode 100644
index bd7301e..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n30.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n30.rz b/tests/data/121B2TestData/AllOptions/test_p512n30.rz
deleted file mode 100644
index e29118d..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n30.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n31.dat b/tests/data/121B2TestData/AllOptions/test_p512n31.dat
deleted file mode 100644
index 9c37006..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n31.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n31.rz b/tests/data/121B2TestData/AllOptions/test_p512n31.rz
deleted file mode 100644
index d77cbef..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n31.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n32.dat b/tests/data/121B2TestData/AllOptions/test_p512n32.dat
deleted file mode 100644
index b84bbff..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n32.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/AllOptions/test_p512n32.rz b/tests/data/121B2TestData/AllOptions/test_p512n32.rz
deleted file mode 100644
index b1397b7..0000000
--- a/tests/data/121B2TestData/AllOptions/test_p512n32.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat b/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat
deleted file mode 100644
index ddf74d0..0000000
--- a/tests/data/121B2TestData/ExtendedParameters/sar32bit.dat
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz
deleted file mode 100644
index b89659d..0000000
--- a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j16.r256.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz b/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz
deleted file mode 100644
index 0c4ab28..0000000
--- a/tests/data/121B2TestData/ExtendedParameters/sar32bit.j64.r4096.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat
deleted file mode 100644
index 22ea0f3..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.dat
+++ /dev/null
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
deleted file mode 100644
index c3ba347..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 94751e8..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n01-restricted.rz
+++ /dev/null
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
deleted file mode 100644
index f5764e0..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 3736d43..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n02-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
- 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
deleted file mode 100644
index 03ffd5c..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-basic.rz
+++ /dev/null
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
deleted file mode 100644
index af535f2..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n03-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a024ee3..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-basic.rz
+++ /dev/null
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
deleted file mode 100644
index e4ca921..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n04-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8bc886d..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n05.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz
deleted file mode 100644
index 2238e0e..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n06.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz
deleted file mode 100644
index 0a452d9..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n07.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz
deleted file mode 100644
index 82c483b..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset1_8bit.n08.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat
deleted file mode 100644
index 141f545..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.dat
+++ /dev/null
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
deleted file mode 100644
index cde6ee4..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 05a3432..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n01-restricted.rz
+++ /dev/null
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
deleted file mode 100644
index e0cc84d..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 1cccf0a..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n02-restricted.rz
+++ /dev/null
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
deleted file mode 100644
index 05f40f7..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-basic.rz
+++ /dev/null
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
deleted file mode 100644
index fd94714..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n03-restricted.rz
+++ /dev/null
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
deleted file mode 100644
index 899a8c9..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 519d82a..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n04-restricted.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz
deleted file mode 100644
index 774d180..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n05.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz
deleted file mode 100644
index b900f28..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n06.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz
deleted file mode 100644
index f5c3cea..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n07.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz
deleted file mode 100644
index 34f0ec0..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset2_8bit.n08.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat
deleted file mode 100644
index 37f69d2..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.dat
+++ /dev/null
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
deleted file mode 100644
index 2262aca..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-basic.rz
+++ /dev/null
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
deleted file mode 100644
index dabae82..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n01-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
- \ 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
deleted file mode 100644
index 43f03ee..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 42fead7..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n02-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index baf899d..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-basic.rz
+++ /dev/null
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
deleted file mode 100644
index 4210bb6..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n03-restricted.rz
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 488b09e..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-basic.rz
+++ /dev/null
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
deleted file mode 100644
index d99a350..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n04-restricted.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz
deleted file mode 100644
index 2e8d74f..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n05.rz
+++ /dev/null
@@ -1 +0,0 @@
-!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
deleted file mode 100644
index 0302613..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n06.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz
deleted file mode 100644
index d56b761..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n07.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz b/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz
deleted file mode 100644
index 81125dd..0000000
--- a/tests/data/121B2TestData/LowEntropyOptions/Lowset3_8bit.n08.rz
+++ /dev/null
Binary files differ
diff --git a/tests/data/121B2TestData/README121BTest.docx b/tests/data/121B2TestData/README121BTest.docx
deleted file mode 100644
index 72f8034..0000000
--- a/tests/data/121B2TestData/README121BTest.docx
+++ /dev/null
Binary files differ
diff --git a/tests/data/typical.rz b/tests/data/typical.rz
deleted file mode 100644
index fc1e827..0000000
--- a/tests/data/typical.rz
+++ /dev/null
Binary files differ
diff --git a/tests/sampledata.sh b/tests/sampledata.sh
index 12649a4..894ef22 100755
--- a/tests/sampledata.sh
+++ b/tests/sampledata.sh
@@ -1,7 +1,10 @@
#!/bin/sh
set -e
AEC=../src/aec
-CCSDS_DATA=${srcdir}/data/121B2TestData
+if [ -n "$1" ]; then
+ srcdir=$1
+fi
+CCSDS_DATA=${srcdir}/../data/121B2TestData
ALLO=${CCSDS_DATA}/AllOptions
EXTP=${CCSDS_DATA}/ExtendedParameters
LOWE=${CCSDS_DATA}/LowEntropyOptions
diff --git a/tests/szcomp.sh b/tests/szcomp.sh
index e9a3095..f140932 100755
--- a/tests/szcomp.sh
+++ b/tests/szcomp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
-testfile=${srcdir}/data/121B2TestData/ExtendedParameters/sar32bit.dat
+testfile=${srcdir}/../data/121B2TestData/ExtendedParameters/sar32bit.dat
if [ ! -f $testfile ]; then
echo "ERROR: sample data not found."
exit -1