From c7acc82274cefb2df0abbd5358eea50d3bbd9114 Mon Sep 17 00:00:00 2001 From: Mathis Rosenhauer Date: Thu, 24 Jul 2014 17:25:48 +0200 Subject: [PATCH] (Re)add test for libsz. --- tests/Makefile.am | 15 ++++++++++++--- tests/check_szcomp.c | 32 ++++++++++++++++---------------- tests/szcomp.sh | 8 ++++++++ 3 files changed, 36 insertions(+), 19 deletions(-) create mode 100755 tests/szcomp.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index f335b1d..3cbc887 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,13 @@ AUTOMAKE_OPTIONS = color-tests AM_CPPFLAGS = -I$(top_srcdir)/src -TESTS = check_code_options check_buffer_sizes check_long_fs sampledata.sh +TESTS = check_code_options check_buffer_sizes check_long_fs \ +szcomp.sh sampledata.sh +TEST_EXTENSIONS = .sh 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 +check_PROGRAMS = check_code_options check_buffer_sizes check_long_fs \ +check_szcomp + check_code_options_SOURCES = check_code_options.c check_aec.h \ $(top_builddir)/src/libaec.h @@ -13,8 +17,13 @@ $(top_builddir)/src/libaec.h check_long_fs_SOURCES = check_long_fs.c check_aec.h \ $(top_builddir)/src/libaec.h +check_szcomp_SOURCES = check_szcomp.c $(top_builddir)/src/szlib.h + LDADD = libcheck_aec.la $(top_builddir)/src/libaec.la -EXTRA_DIST = sampledata.sh benc.sh bdec.sh CMakeLists.txt +check_szcomp_LDADD = $(top_builddir)/src/libsz.la + +EXTRA_DIST = sampledata.sh szcomp.sh benc.sh bdec.sh CMakeLists.txt +szcomp.log: sampledata.log bench: benc bdec benc: $(srcdir)/benc.sh diff --git a/tests/check_szcomp.c b/tests/check_szcomp.c index 4d219e7..8133754 100644 --- a/tests/check_szcomp.c +++ b/tests/check_szcomp.c @@ -1,13 +1,12 @@ #include -#include #include #include #include "szlib.h" -#define OPTIONS_MASK (SZ_RAW_OPTION_MASK \ - | SZ_MSB_OPTION_MASK \ - | SZ_NN_OPTION_MASK) -#define PIXELS_PER_BLOCK (8) +#define OPTIONS_MASK (SZ_RAW_OPTION_MASK \ + | SZ_MSB_OPTION_MASK \ + | SZ_NN_OPTION_MASK) +#define PIXELS_PER_BLOCK (8) #define PIXELS_PER_SCANLINE (PIXELS_PER_BLOCK*128) int main(int argc, char *argv[]) @@ -18,18 +17,25 @@ int main(int argc, char *argv[]) size_t destLen, dest1Len, sourceLen; FILE *fp; - if (argc < 3) - { - fprintf(stderr, "Usage: %s buffer_size file\n", argv[0]); + if (argc < 2) { + fprintf(stderr, "Usage: %s file\n", argv[0]); return 1; } + + if ((fp = fopen(argv[1], "rb")) == NULL) { + fprintf(stderr, "Can't open %s\n", argv[1]); + return 1; + } + fseek(fp, 0L, SEEK_END); + sourceLen = ftell(fp); + fseek(fp, 0L, SEEK_SET); + destLen = sourceLen + sourceLen / 10; + sz_param.options_mask = OPTIONS_MASK; sz_param.bits_per_pixel = 64; sz_param.pixels_per_block = PIXELS_PER_BLOCK; sz_param.pixels_per_scanline = PIXELS_PER_SCANLINE; - sourceLen = destLen = atoi(argv[1]); - source = (unsigned char *)malloc(sourceLen); dest = (unsigned char *)malloc(destLen); dest1 = (unsigned char *)malloc(destLen); @@ -37,12 +43,6 @@ int main(int argc, char *argv[]) if (source == NULL || dest == NULL || dest1 == NULL) return 1; - if ((fp = fopen(argv[2], "r")) == NULL) - { - fprintf(stderr, "Can't open %s\n", argv[2]); - exit(-1); - } - sourceLen = fread(source, 1, sourceLen, fp); status = SZ_BufftoBuffCompress(dest, &destLen, diff --git a/tests/szcomp.sh b/tests/szcomp.sh new file mode 100755 index 0000000..6335835 --- /dev/null +++ b/tests/szcomp.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +testfile=121B2TestData/ExtendedParameters/sar32bit.dat +if [ ! -f $testfile ]; then + echo "ERROR: sample data not found." + exit -1 +fi +./check_szcomp $testfile -- 2.7.4