From 359d71e90050a8b83f7bc7d2ecd4ff29c477cc22 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 26 Jun 2022 22:51:27 +0200 Subject: Cleanup: rename libfstream to libio, split headers Signed-off-by: David Oberhollenzer --- tests/Makemodule.am | 2 +- tests/libfstream/Makemodule.am | 68 ------ tests/libfstream/get_line.c | 166 --------------- tests/libfstream/get_line.txt | 11 - tests/libfstream/uncompress.c | 431 -------------------------------------- tests/libfstree/Makemodule.am | 12 +- tests/libio/Makemodule.am | 68 ++++++ tests/libio/get_line.c | 166 +++++++++++++++ tests/libio/get_line.txt | 11 + tests/libio/uncompress.c | 432 +++++++++++++++++++++++++++++++++++++++ tests/libtar/Makemodule.am | 60 +++--- tests/libtar/tar_big_file.c | 1 + tests/libtar/tar_fuzz.c | 1 + tests/libtar/tar_simple.c | 1 + tests/libtar/tar_sparse.c | 1 + tests/libtar/tar_sparse_gnu.c | 1 + tests/libtar/tar_target_filled.c | 1 + tests/libtar/tar_xattr.c | 1 + tests/libtar/tar_xattr_bin.c | 1 + tests/libutil/Makemodule.am | 2 +- tests/libutil/str_table.c | 2 +- 21 files changed, 724 insertions(+), 715 deletions(-) delete mode 100644 tests/libfstream/Makemodule.am delete mode 100644 tests/libfstream/get_line.c delete mode 100644 tests/libfstream/get_line.txt delete mode 100644 tests/libfstream/uncompress.c create mode 100644 tests/libio/Makemodule.am create mode 100644 tests/libio/get_line.c create mode 100644 tests/libio/get_line.txt create mode 100644 tests/libio/uncompress.c (limited to 'tests') diff --git a/tests/Makemodule.am b/tests/Makemodule.am index 3165889..0ae3f8b 100644 --- a/tests/Makemodule.am +++ b/tests/Makemodule.am @@ -1,5 +1,5 @@ include tests/libutil/Makemodule.am -include tests/libfstream/Makemodule.am +include tests/libio/Makemodule.am include tests/libfstree/Makemodule.am include tests/libtar/Makemodule.am include tests/libsqfs/Makemodule.am diff --git a/tests/libfstream/Makemodule.am b/tests/libfstream/Makemodule.am deleted file mode 100644 index 57a98bc..0000000 --- a/tests/libfstream/Makemodule.am +++ /dev/null @@ -1,68 +0,0 @@ -test_get_line_SOURCES = tests/libfstream/get_line.c tests/test.h -test_get_line_LDADD = libfstream.a libcompat.a -test_get_line_CPPFLAGS = $(AM_CPPFLAGS) -test_get_line_CPPFLAGS += -DTESTFILE=$(top_srcdir)/tests/libfstream/get_line.txt - -test_xfrm_bzip2_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_bzip2_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_bzip2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_BZIP2=1 - -test_xfrm_bzip22_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_bzip22_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_bzip22_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_bzip22_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_BZIP22=1 - -test_xfrm_xz_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_xz_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_xz_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_xz_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_XZ=1 - -test_xfrm_xz2_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_xz2_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_xz2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_xz2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_XZ2=1 - -test_xfrm_gzip_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_gzip_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_gzip_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_GZIP=1 - -test_xfrm_zstd_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_zstd_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_zstd_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_ZSTD=1 - -test_xfrm_zstd2_SOURCES = tests/libfstream/uncompress.c tests/test.h -test_xfrm_zstd2_LDADD = libfstream.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) -test_xfrm_zstd2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) -test_xfrm_zstd2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_ZSTD2=1 - -if BUILD_TOOLS -check_PROGRAMS += test_get_line -TESTS += test_get_line - -if WITH_BZIP2 -check_PROGRAMS += test_xfrm_bzip2 test_xfrm_bzip22 -TESTS += test_xfrm_bzip2 test_xfrm_bzip22 -endif - -if WITH_XZ -check_PROGRAMS += test_xfrm_xz test_xfrm_xz2 -TESTS += test_xfrm_xz test_xfrm_xz2 -endif - -if WITH_GZIP -check_PROGRAMS += test_xfrm_gzip -TESTS += test_xfrm_gzip -endif - -if WITH_ZSTD -if HAVE_ZSTD_STREAM -check_PROGRAMS += test_xfrm_zstd test_xfrm_zstd2 -TESTS += test_xfrm_zstd test_xfrm_zstd2 -endif -endif -endif - -EXTRA_DIST += $(top_srcdir)/tests/libfstream/get_line.txt diff --git a/tests/libfstream/get_line.c b/tests/libfstream/get_line.c deleted file mode 100644 index 7d9a26a..0000000 --- a/tests/libfstream/get_line.c +++ /dev/null @@ -1,166 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * get_line.c - * - * Copyright (C) 2019 David Oberhollenzer - */ -#include "config.h" - -#include "fstream.h" -#include "../test.h" - -typedef struct { - size_t line_num; - const char *str; -} line_t; - -static void run_test_case(const line_t *lines, size_t count, - int flags) -{ - size_t i, line_num, old_line_num; - istream_t *fp; - char *line; - int ret; - - fp = istream_open_file(STRVALUE(TESTFILE)); - TEST_NOT_NULL(fp); - - line_num = 1; - line = NULL; - - for (i = 0; i < count; ++i) { - old_line_num = line_num; - ret = istream_get_line(fp, &line, &line_num, flags); - - TEST_ASSERT(line_num >= old_line_num); - TEST_EQUAL_I(ret, 0); - TEST_NOT_NULL(line); - - TEST_EQUAL_UI(line_num, lines[i].line_num); - TEST_STR_EQUAL(line, lines[i].str); - - free(line); - line = NULL; - line_num += 1; - } - - ret = istream_get_line(fp, &line, &line_num, flags); - TEST_ASSERT(ret > 0); - - sqfs_destroy(fp); -} - -static const line_t lines_raw[] = { - { 1, "" }, - { 2, "The quick" }, - { 3, " " }, - { 4, " brown fox " }, - { 5, "" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 9, "" }, - { 10, "dog" }, - { 11, "" }, -}; - -static const line_t lines_ltrim[] = { - { 1, "" }, - { 2, "The quick" }, - { 3, "" }, - { 4, "brown fox " }, - { 5, "" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 9, "" }, - { 10, "dog" }, - { 11, "" }, -}; - -static const line_t lines_rtrim[] = { - { 1, "" }, - { 2, "The quick" }, - { 3, "" }, - { 4, " brown fox" }, - { 5, "" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 9, "" }, - { 10, "dog" }, - { 11, "" }, -}; - -static const line_t lines_trim[] = { - { 1, "" }, - { 2, "The quick" }, - { 3, "" }, - { 4, "brown fox" }, - { 5, "" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 9, "" }, - { 10, "dog" }, - { 11, "" }, -}; - -static const line_t lines_no_empty[] = { - { 2, "The quick" }, - { 3, " " }, - { 4, " brown fox " }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 10, "dog" }, -}; - -static const line_t lines_no_empty_ltrim[] = { - { 2, "The quick" }, - { 4, "brown fox " }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 10, "dog" }, -}; - -static const line_t lines_no_empty_rtrim[] = { - { 2, "The quick" }, - { 4, " brown fox" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 10, "dog" }, -}; - -static const line_t lines_no_empty_trim[] = { - { 2, "The quick" }, - { 4, "brown fox" }, - { 6, "jumps over" }, - { 7, "the" }, - { 8, "lazy" }, - { 10, "dog" }, -}; - -int main(int argc, char **argv) -{ - (void)argc; (void)argv; - - run_test_case(lines_raw, 11, 0); - run_test_case(lines_ltrim, 11, ISTREAM_LINE_LTRIM); - run_test_case(lines_rtrim, 11, ISTREAM_LINE_RTRIM); - run_test_case(lines_trim, 11, - ISTREAM_LINE_LTRIM | ISTREAM_LINE_RTRIM); - - run_test_case(lines_no_empty, 7, ISTREAM_LINE_SKIP_EMPTY); - run_test_case(lines_no_empty_ltrim, 6, - ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM); - run_test_case(lines_no_empty_rtrim, 6, - ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_RTRIM); - run_test_case(lines_no_empty_trim, 6, - ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM | - ISTREAM_LINE_RTRIM); - - return EXIT_SUCCESS; -} diff --git a/tests/libfstream/get_line.txt b/tests/libfstream/get_line.txt deleted file mode 100644 index a1994f0..0000000 --- a/tests/libfstream/get_line.txt +++ /dev/null @@ -1,11 +0,0 @@ - -The quick - - brown fox - -jumps over -the -lazy - -dog - diff --git a/tests/libfstream/uncompress.c b/tests/libfstream/uncompress.c deleted file mode 100644 index 5f0cbec..0000000 --- a/tests/libfstream/uncompress.c +++ /dev/null @@ -1,431 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * uncompress.c - * - * Copyright (C) 2021 David Oberhollenzer - */ -#include "fstream.h" -#include "../test.h" - -static sqfs_u8 data_in[] = { -#if defined(TEST_BZIP2) - 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, - 0x53, 0x59, 0x05, 0x24, 0x28, 0x04, 0x00, 0x00, - 0x27, 0xd7, 0x80, 0x00, 0x10, 0x40, 0x05, 0x06, - 0x04, 0x02, 0x00, 0x3f, 0xe7, 0xff, 0x40, 0x30, - 0x01, 0x2d, 0x23, 0x62, 0x26, 0x05, 0x3d, 0x03, - 0x54, 0xfd, 0x53, 0x4c, 0x86, 0x9e, 0x90, 0x6a, - 0x9e, 0x9e, 0x85, 0x3c, 0xa0, 0x00, 0x00, 0x1a, - 0x9e, 0x41, 0x13, 0x13, 0x28, 0x69, 0x03, 0xd4, - 0x0f, 0x1c, 0x70, 0xd0, 0xb4, 0xe3, 0xe4, 0x75, - 0x4e, 0x8b, 0x67, 0x43, 0x7b, 0x38, 0x27, 0x77, - 0xe4, 0xc1, 0x98, 0x3a, 0x2d, 0x3a, 0xe4, 0x44, - 0x98, 0xdc, 0x49, 0x8b, 0x22, 0x48, 0xfc, 0xc8, - 0xe7, 0x57, 0x05, 0x3c, 0x5a, 0xee, 0x5a, 0x84, - 0xcd, 0x7c, 0x8f, 0x26, 0x6b, 0x6e, 0xf7, 0xb5, - 0x49, 0x1f, 0x79, 0x42, 0x5d, 0x09, 0x8c, 0xc6, - 0xde, 0x0c, 0x0d, 0xb1, 0x46, 0xb4, 0xee, 0xd9, - 0x8f, 0x33, 0x37, 0x04, 0xa9, 0x05, 0x49, 0xe3, - 0x04, 0x16, 0x62, 0x36, 0x3a, 0x01, 0xda, 0xd4, - 0xc8, 0x8a, 0x32, 0x02, 0x1f, 0x62, 0x4b, 0xa4, - 0x49, 0x59, 0xda, 0x50, 0x85, 0x69, 0x35, 0x21, - 0x10, 0xc6, 0x8a, 0x3c, 0x44, 0x95, 0xb0, 0xbc, - 0xc5, 0x6b, 0xea, 0xfb, 0x40, 0xbd, 0x14, 0x01, - 0x6a, 0xfa, 0xcd, 0x67, 0xd8, 0x2d, 0x93, 0x8b, - 0xda, 0x44, 0x1b, 0xe9, 0x5a, 0x87, 0x60, 0xb0, - 0xe0, 0x73, 0xd1, 0x01, 0x3a, 0x66, 0x05, 0xcc, - 0x34, 0xa0, 0x63, 0x8d, 0x35, 0x5e, 0xa0, 0x9f, - 0x05, 0x89, 0x15, 0x51, 0x48, 0x16, 0x0c, 0x61, - 0xf4, 0x30, 0xb8, 0x07, 0x29, 0xc0, 0xf5, 0x1a, - 0xe1, 0x0d, 0x6c, 0xfe, 0x91, 0xda, 0x13, 0x2f, - 0x8e, 0x5b, 0x1c, 0xfc, 0xb3, 0xb2, 0x30, 0x9d, - 0xf6, 0x09, 0x30, 0x55, 0x30, 0x67, 0xc2, 0x87, - 0xe9, 0x9a, 0xd4, 0x1d, 0x66, 0x11, 0x54, 0x89, - 0x21, 0xe1, 0x55, 0x84, 0xbf, 0xa6, 0x11, 0xa4, - 0xb8, 0x40, 0xed, 0x42, 0x20, 0xb9, 0xb7, 0x26, - 0x31, 0x14, 0x4f, 0x86, 0xdc, 0x50, 0x34, 0x38, - 0x8b, 0x57, 0x77, 0x21, 0xf6, 0x89, 0xbd, 0xc5, - 0x65, 0xc3, 0x23, 0x45, 0xec, 0x7f, 0x8b, 0xb9, - 0x22, 0x9c, 0x28, 0x48, 0x02, 0x92, 0x14, 0x02, - 0x00, -#elif defined(TEST_BZIP22) - 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, - 0x53, 0x59, 0x5d, 0x09, 0x24, 0x1d, 0x00, 0x00, - 0x13, 0xd7, 0x80, 0x00, 0x10, 0x40, 0x05, 0x00, - 0x04, 0x02, 0x00, 0x3e, 0xa7, 0xff, 0x40, 0x30, - 0x00, 0xac, 0x43, 0x54, 0xf5, 0x36, 0x4c, 0xa7, - 0xa8, 0xd3, 0x6a, 0x60, 0x81, 0x40, 0x00, 0xd0, - 0x32, 0x64, 0x0d, 0x53, 0xda, 0x02, 0x09, 0xa2, - 0x68, 0x34, 0xd1, 0x27, 0x4a, 0xdd, 0xf2, 0x0a, - 0x73, 0x43, 0xf9, 0xa2, 0x51, 0x85, 0x76, 0x45, - 0x9a, 0x68, 0x3a, 0xe7, 0x0d, 0xc0, 0x21, 0x4a, - 0xc4, 0xf9, 0xf7, 0x40, 0xc3, 0x10, 0xb2, 0x9b, - 0x58, 0x56, 0x71, 0x50, 0x2f, 0xa4, 0xc5, 0x61, - 0x19, 0xf6, 0x59, 0x06, 0x82, 0x03, 0x7f, 0xeb, - 0xd2, 0x61, 0x88, 0xcd, 0xe8, 0xf7, 0xe8, 0x87, - 0x59, 0x9d, 0xe1, 0xf8, 0x19, 0x6e, 0xad, 0x77, - 0xbf, 0x34, 0x17, 0x21, 0x6b, 0x91, 0xc9, 0x52, - 0xd0, 0x81, 0x1e, 0xb5, 0x0b, 0xee, 0x42, 0x84, - 0x80, 0xd5, 0xa1, 0x8a, 0x04, 0x18, 0x4d, 0xf3, - 0xda, 0x7e, 0x3c, 0x40, 0xa4, 0xdb, 0xe5, 0xf0, - 0x37, 0x40, 0x3a, 0x7d, 0xa7, 0x45, 0x21, 0xf2, - 0x5a, 0x7b, 0x59, 0x56, 0x16, 0xd5, 0xac, 0x9f, - 0x60, 0x85, 0x0e, 0xf5, 0x73, 0xd9, 0x47, 0xe2, - 0xee, 0x48, 0xa7, 0x0a, 0x12, 0x0b, 0xa1, 0x24, - 0x83, 0xa0, - 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, - 0x53, 0x59, 0x2c, 0x24, 0x39, 0xa0, 0x00, 0x00, - 0x1f, 0x55, 0x80, 0x00, 0x10, 0x40, 0x05, 0x06, - 0x00, 0x3f, 0xe7, 0xff, 0x40, 0x30, 0x00, 0xb5, - 0x91, 0x13, 0x4f, 0x54, 0x7a, 0x6a, 0x6d, 0x4d, - 0xa2, 0x68, 0x0c, 0x84, 0x53, 0xf5, 0x30, 0x89, - 0xa3, 0xd4, 0x0d, 0x0f, 0x49, 0xa0, 0xd4, 0xf4, - 0xd1, 0x53, 0xf4, 0x93, 0x69, 0x3c, 0x81, 0x1a, - 0x65, 0x53, 0x90, 0x51, 0x07, 0x2a, 0xad, 0x8f, - 0x63, 0xba, 0x25, 0xc2, 0x0c, 0x8b, 0xb9, 0x95, - 0x15, 0xd8, 0xda, 0x61, 0x5c, 0xa9, 0xe4, 0x0b, - 0x21, 0xc9, 0x97, 0x57, 0x01, 0x28, 0x9b, 0xfb, - 0x94, 0xb9, 0x48, 0xa3, 0x0a, 0xc6, 0x1c, 0x54, - 0x98, 0x9a, 0x39, 0xc3, 0x87, 0x90, 0x33, 0x58, - 0x2d, 0x3e, 0x16, 0xb1, 0xae, 0x26, 0x89, 0x75, - 0xf5, 0x77, 0xa5, 0x8e, 0x5b, 0x8c, 0x8a, 0x39, - 0xbd, 0x75, 0x21, 0x9d, 0x99, 0x18, 0x4a, 0x91, - 0xab, 0xbc, 0x08, 0x87, 0xa4, 0xf1, 0x81, 0xb5, - 0xb4, 0xb0, 0xfe, 0x6b, 0x9f, 0xbe, 0x19, 0x82, - 0xd1, 0x50, 0xe1, 0x5e, 0x13, 0xb5, 0xc6, 0x2c, - 0xa4, 0x82, 0xf2, 0x5c, 0xc3, 0x20, 0x41, 0x13, - 0x56, 0x63, 0x3d, 0xec, 0x71, 0x2a, 0xbf, 0x2c, - 0x60, 0x2f, 0x7a, 0x4d, 0xcb, 0x3f, 0x8b, 0xb9, - 0x22, 0x9c, 0x28, 0x48, 0x16, 0x12, 0x1c, 0xd0, - 0x00, -#elif defined(TEST_XZ) - 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x00, - 0xff, 0x12, 0xd9, 0x41, 0x02, 0x00, 0x21, 0x01, - 0x1c, 0x00, 0x00, 0x00, 0x10, 0xcf, 0x58, 0xcc, - 0xe0, 0x01, 0xbd, 0x01, 0x43, 0x5d, 0x00, 0x26, - 0x1b, 0xca, 0x46, 0x67, 0x5a, 0xf2, 0x77, 0xb8, - 0x7d, 0x86, 0xd8, 0x41, 0xdb, 0x05, 0x35, 0xcd, - 0x83, 0xa5, 0x7c, 0x12, 0xa5, 0x05, 0xdb, 0x90, - 0xbd, 0x2f, 0x14, 0xd3, 0x71, 0x72, 0x96, 0xa8, - 0x8a, 0x7d, 0x84, 0x56, 0x71, 0x8d, 0x6a, 0x22, - 0x98, 0xab, 0x9e, 0x3d, 0xc3, 0x55, 0xef, 0xcc, - 0xa5, 0xc3, 0xdd, 0x5b, 0x8e, 0xbf, 0x03, 0x81, - 0x21, 0x40, 0xd6, 0x26, 0x91, 0x02, 0x45, 0x4e, - 0x20, 0x91, 0xcf, 0x8c, 0x51, 0x22, 0x02, 0x70, - 0xba, 0x05, 0x6b, 0x83, 0xef, 0x3f, 0x8e, 0x09, - 0xef, 0x88, 0xf5, 0x37, 0x1b, 0x89, 0x8d, 0xff, - 0x1e, 0xee, 0xe8, 0xb0, 0xac, 0xf2, 0x6e, 0xd4, - 0x3e, 0x25, 0xaf, 0xa0, 0x6d, 0x2e, 0xc0, 0x7f, - 0xb5, 0xa0, 0xcb, 0x90, 0x1f, 0x08, 0x1a, 0xe2, - 0x90, 0x20, 0x19, 0x71, 0x0c, 0xe8, 0x3f, 0xe5, - 0x39, 0xeb, 0x9a, 0x62, 0x4f, 0x06, 0xda, 0x3c, - 0x32, 0x59, 0xcc, 0x83, 0xe3, 0x83, 0x0f, 0x38, - 0x7d, 0x43, 0x37, 0x6c, 0x0b, 0x05, 0x65, 0x98, - 0x25, 0xdb, 0xf2, 0xc0, 0x2d, 0x39, 0x36, 0x5d, - 0xd4, 0xb6, 0xc2, 0x79, 0x73, 0x3e, 0xc2, 0x6e, - 0x54, 0xec, 0x78, 0x2b, 0x5d, 0xf1, 0xd1, 0xb4, - 0xb3, 0xcd, 0xf3, 0x89, 0xf5, 0x81, 0x3e, 0x2c, - 0x65, 0xd6, 0x73, 0xd3, 0x1b, 0x20, 0x68, 0x0c, - 0x93, 0xd4, 0xfc, 0x9f, 0xf8, 0xa7, 0xd4, 0xfa, - 0x3a, 0xb1, 0x13, 0x93, 0x4b, 0xec, 0x78, 0x7d, - 0x5c, 0x81, 0x80, 0xe5, 0x14, 0x78, 0xfe, 0x7e, - 0xde, 0xf7, 0xad, 0x9e, 0x84, 0xba, 0xf1, 0x00, - 0xe9, 0xbd, 0x2c, 0xf4, 0x70, 0x7d, 0xbe, 0x29, - 0xb9, 0xf0, 0x10, 0xb9, 0x01, 0xf1, 0x76, 0x8a, - 0x5a, 0xad, 0x02, 0xa1, 0x32, 0xc8, 0x53, 0x59, - 0x11, 0x4c, 0xe2, 0x98, 0x34, 0xd9, 0x23, 0x51, - 0x4a, 0x40, 0x2b, 0x87, 0x41, 0xdd, 0x50, 0xcd, - 0x98, 0x1e, 0x29, 0x86, 0x23, 0x93, 0x3e, 0x9b, - 0x6b, 0x16, 0xa1, 0x40, 0xac, 0xe7, 0x40, 0xfe, - 0xa9, 0x87, 0x48, 0x25, 0x52, 0x02, 0x8b, 0xc4, - 0x68, 0x08, 0x5a, 0x62, 0xc1, 0xb2, 0x07, 0x3b, - 0x26, 0x1e, 0x59, 0x5c, 0x47, 0x24, 0xae, 0x8e, - 0xe5, 0xf7, 0xe6, 0x4b, 0x13, 0xb4, 0x6d, 0x46, - 0x65, 0x4f, 0xd0, 0x48, 0xcc, 0x51, 0x4b, 0x80, - 0xcb, 0xf1, 0xd4, 0x6c, 0x45, 0x98, 0x92, 0x47, - 0xeb, 0x60, 0x00, 0x00, 0x00, 0x01, 0xd7, 0x02, - 0xbe, 0x03, 0x00, 0x00, 0xda, 0x2c, 0x45, 0x49, - 0xa8, 0x00, 0x0a, 0xfc, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x59, 0x5a -#elif defined(TEST_XZ2) - 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04, - 0xe6, 0xd6, 0xb4, 0x46, 0x02, 0x00, 0x21, 0x01, - 0x16, 0x00, 0x00, 0x00, 0x74, 0x2f, 0xe5, 0xa3, - 0xe0, 0x00, 0xdc, 0x00, 0xb3, 0x5d, 0x00, 0x26, - 0x1b, 0xca, 0x46, 0x67, 0x5a, 0xf2, 0x77, 0xb8, - 0x7d, 0x86, 0xd8, 0x41, 0xdb, 0x05, 0x35, 0xcd, - 0x83, 0xa5, 0x7c, 0x12, 0xa5, 0x05, 0xdb, 0x90, - 0xbd, 0x2f, 0x14, 0xd3, 0x71, 0x72, 0x96, 0xa8, - 0x8a, 0x7d, 0x84, 0x56, 0x71, 0x8d, 0x6a, 0x22, - 0x98, 0xab, 0x9e, 0x3d, 0xc3, 0x55, 0xef, 0xcc, - 0xa5, 0xc3, 0xdd, 0x5b, 0x8e, 0xbf, 0x03, 0x81, - 0x21, 0x40, 0xd6, 0x26, 0x91, 0x02, 0x45, 0x4e, - 0x20, 0x91, 0xcf, 0x8c, 0x51, 0x22, 0x02, 0x70, - 0xba, 0x05, 0x6b, 0x83, 0xef, 0x3f, 0x8e, 0x09, - 0xef, 0x88, 0xf5, 0x37, 0x1b, 0x89, 0x8d, 0xff, - 0x1e, 0xee, 0xe8, 0xb0, 0xac, 0xf2, 0x6e, 0xd4, - 0x3e, 0x25, 0xaf, 0xa0, 0x6d, 0x2e, 0xc0, 0x7f, - 0xb5, 0xa0, 0xcb, 0x90, 0x1f, 0x08, 0x1a, 0xe2, - 0x90, 0x20, 0x19, 0x71, 0x0c, 0xe8, 0x3f, 0xe5, - 0x39, 0xeb, 0x9a, 0x62, 0x4f, 0x06, 0xda, 0x3c, - 0x32, 0x59, 0xcc, 0x83, 0xe3, 0x83, 0x0f, 0x38, - 0x7d, 0x43, 0x37, 0x6c, 0x0b, 0x05, 0x65, 0x98, - 0x25, 0xdb, 0xf2, 0xc0, 0x2d, 0x39, 0x36, 0x5d, - 0xd4, 0xb6, 0xc2, 0x79, 0x73, 0x3e, 0xc2, 0x6e, - 0x54, 0xec, 0x78, 0x2b, 0x5d, 0xf1, 0xd1, 0xb4, - 0xb3, 0xcd, 0xf3, 0x89, 0xf5, 0x80, 0x79, 0x46, - 0xc0, 0x00, 0x00, 0x00, 0xc4, 0xf5, 0x1d, 0x08, - 0xf0, 0x34, 0x3a, 0x59, 0x00, 0x01, 0xcf, 0x01, - 0xdd, 0x01, 0x00, 0x00, 0x7f, 0x5a, 0x77, 0xcb, - 0xb1, 0xc4, 0x67, 0xfb, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x59, 0x5a, - 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04, - 0xe6, 0xd6, 0xb4, 0x46, 0x02, 0x00, 0x21, 0x01, - 0x16, 0x00, 0x00, 0x00, 0x74, 0x2f, 0xe5, 0xa3, - 0xe0, 0x00, 0xe0, 0x00, 0xb7, 0x5d, 0x00, 0x31, - 0x9b, 0xca, 0x19, 0xc5, 0x54, 0xec, 0xb6, 0x54, - 0xe7, 0xb1, 0x7d, 0xc4, 0x57, 0x9e, 0x6c, 0x89, - 0xad, 0x4a, 0x6d, 0x16, 0xd8, 0x3c, 0x05, 0x94, - 0x10, 0x16, 0x99, 0x38, 0x21, 0xa3, 0xb9, 0xc5, - 0x80, 0xff, 0xfc, 0xee, 0xd4, 0xd5, 0x3f, 0xdd, - 0x8c, 0xd7, 0x3d, 0x8f, 0x76, 0xec, 0x96, 0x9d, - 0x20, 0xac, 0xcb, 0x18, 0xf5, 0xb2, 0x9c, 0x12, - 0xf6, 0x7c, 0x33, 0xdc, 0x4f, 0x9a, 0xe5, 0x2d, - 0x63, 0x68, 0xa4, 0x2b, 0x1d, 0x0a, 0x1e, 0xf0, - 0xfe, 0x73, 0xf2, 0x5f, 0x7b, 0xb4, 0xea, 0x54, - 0xad, 0x27, 0xd1, 0xff, 0xb6, 0x50, 0x06, 0x7b, - 0x51, 0x3f, 0x25, 0x8a, 0xcf, 0x4c, 0x03, 0x3e, - 0xc3, 0xad, 0x47, 0x34, 0xcf, 0xba, 0x45, 0x79, - 0xd0, 0x7b, 0xf6, 0x66, 0x63, 0xc0, 0xc6, 0x69, - 0xa7, 0x51, 0x84, 0xa8, 0xa0, 0x0b, 0xbc, 0x6f, - 0x13, 0x89, 0xd6, 0x5e, 0xac, 0xca, 0x2f, 0xd2, - 0xe7, 0xe1, 0x1e, 0x78, 0x22, 0x3a, 0x59, 0x6c, - 0x9c, 0x8c, 0x65, 0xf1, 0x5b, 0xf4, 0xbf, 0xd5, - 0xdc, 0x05, 0xeb, 0x70, 0x10, 0xb8, 0x6c, 0xf2, - 0x13, 0x20, 0xb0, 0xdd, 0x3e, 0xb2, 0x92, 0x5b, - 0xa3, 0xf7, 0x94, 0xa1, 0xa1, 0x74, 0x36, 0x9a, - 0xf1, 0xd8, 0xc2, 0xf0, 0xc6, 0x29, 0x7e, 0x85, - 0x28, 0xf5, 0xf2, 0x21, 0x00, 0x00, 0x00, 0x00, - 0xc8, 0x80, 0x67, 0x40, 0xc3, 0xaa, 0x17, 0x57, - 0x00, 0x01, 0xd3, 0x01, 0xe1, 0x01, 0x00, 0x00, - 0x86, 0xdf, 0x9e, 0x05, 0xb1, 0xc4, 0x67, 0xfb, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x59, 0x5a -#elif defined(TEST_GZIP) - 0x1f, 0x8b, 0x08, 0x08, 0x82, 0xd4, 0x97, 0x60, - 0x00, 0x03, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, - 0x78, 0x74, 0x00, 0x35, 0x90, 0xc1, 0x71, 0x43, - 0x31, 0x08, 0x44, 0xef, 0xbf, 0x8a, 0x2d, 0x20, - 0xf3, 0xab, 0x48, 0x6e, 0xb9, 0xa6, 0x00, 0x82, - 0xb0, 0xc3, 0x8c, 0x24, 0x64, 0x09, 0x3c, 0x2e, - 0x3f, 0xc8, 0x4e, 0x6e, 0x42, 0xc0, 0xb2, 0xfb, - 0x3e, 0x6d, 0x4a, 0x83, 0x8e, 0x15, 0x0d, 0xc5, - 0xaa, 0x4d, 0x2c, 0x75, 0x50, 0x13, 0x7f, 0x03, - 0x5b, 0x5f, 0xc2, 0x2e, 0x1e, 0x13, 0x54, 0x74, - 0xe8, 0x62, 0xed, 0x57, 0x48, 0xd5, 0x6c, 0x2e, - 0x29, 0xb9, 0x00, 0xd1, 0x58, 0xcd, 0xca, 0xe1, - 0xd2, 0x46, 0x2e, 0x6b, 0x67, 0x2d, 0x5a, 0xa2, - 0x3b, 0xc2, 0x51, 0xe9, 0x3b, 0xe5, 0x21, 0xfe, - 0x92, 0x16, 0x34, 0xba, 0x76, 0x02, 0x55, 0xbd, - 0x05, 0x9d, 0xf8, 0x72, 0x48, 0xd7, 0x96, 0xda, - 0x68, 0xba, 0x1f, 0xf7, 0x2c, 0xa9, 0xbd, 0x1d, - 0xb7, 0xd0, 0x85, 0x6e, 0xcb, 0x67, 0x14, 0xc8, - 0x43, 0x26, 0xab, 0x93, 0xab, 0x75, 0x44, 0xad, - 0xd4, 0xd8, 0x5e, 0xca, 0x7b, 0x48, 0x97, 0xee, - 0x4b, 0x4f, 0x49, 0x1d, 0x39, 0x0c, 0xa1, 0x34, - 0xde, 0xd2, 0x93, 0x1d, 0xcf, 0x00, 0x79, 0xca, - 0x4f, 0xbc, 0x6f, 0x49, 0x0a, 0x17, 0xe8, 0x8c, - 0x74, 0xf2, 0xca, 0xaa, 0x1d, 0x53, 0xc6, 0x94, - 0x1f, 0xe9, 0x45, 0x66, 0x06, 0xcf, 0x8f, 0xbb, - 0xd5, 0x18, 0x79, 0x4e, 0xd2, 0x4e, 0x26, 0x85, - 0xac, 0x25, 0x07, 0x6b, 0xad, 0xff, 0x84, 0x32, - 0x50, 0xe0, 0x12, 0x57, 0x25, 0x47, 0xdf, 0x86, - 0x30, 0x68, 0x66, 0x11, 0xf3, 0xc4, 0xc7, 0x83, - 0x65, 0xb8, 0xc4, 0xc6, 0x98, 0x0c, 0x8c, 0x99, - 0x84, 0x73, 0x8e, 0x63, 0x68, 0x21, 0xdf, 0x1b, - 0xd6, 0x8f, 0x31, 0x4d, 0x8b, 0xf4, 0x4d, 0x71, - 0x93, 0xca, 0xa3, 0x1c, 0x75, 0x10, 0x32, 0x02, - 0xec, 0x72, 0x51, 0x56, 0x42, 0x91, 0x25, 0x73, - 0x77, 0x9b, 0xd5, 0x6d, 0x83, 0x36, 0x20, 0x4d, - 0x1c, 0xeb, 0x8f, 0x6b, 0xb4, 0xf3, 0xf8, 0x05, - 0x6b, 0x8b, 0x8b, 0x20, 0xbe, 0x01, 0x00, 0x00 -#elif defined(TEST_ZSTD) - 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x88, 0xa5, 0x08, - 0x00, 0x46, 0x97, 0x3a, 0x1a, 0x80, 0x37, 0xcd, - 0x01, 0xc0, 0x8a, 0xec, 0xfe, 0x2d, 0xf2, 0xb9, - 0x44, 0x6b, 0xb9, 0x24, 0x77, 0x56, 0x5a, 0x33, - 0x17, 0x0b, 0x67, 0x83, 0x2e, 0x47, 0x07, 0x31, - 0x00, 0x32, 0x00, 0x33, 0x00, 0xc5, 0x2c, 0x5a, - 0x92, 0x93, 0x0f, 0x7b, 0xd1, 0x1d, 0x63, 0x2c, - 0xc8, 0x99, 0x94, 0x77, 0x8f, 0x94, 0x38, 0x75, - 0x80, 0x2f, 0xae, 0xc1, 0x3e, 0xd2, 0xcf, 0x49, - 0x15, 0x25, 0x1a, 0x87, 0x93, 0xdd, 0xe8, 0x00, - 0x6d, 0xaa, 0xf8, 0x54, 0x74, 0xe5, 0x48, 0x4d, - 0xa6, 0xf3, 0x1a, 0xa3, 0x13, 0x08, 0xe5, 0x26, - 0xdc, 0x73, 0xcc, 0x3e, 0xfd, 0x86, 0xa9, 0x52, - 0xb2, 0x76, 0xc7, 0xc2, 0x0f, 0xe4, 0x84, 0x4b, - 0x12, 0x61, 0x3a, 0x6b, 0x7a, 0x1e, 0x8a, 0x81, - 0xa9, 0x9b, 0x11, 0x37, 0x25, 0x55, 0x73, 0x73, - 0x71, 0xa0, 0x84, 0xca, 0xc3, 0x4b, 0xb5, 0xcc, - 0x50, 0xa6, 0x46, 0xd7, 0xe8, 0x08, 0xaa, 0x04, - 0x28, 0xb1, 0x8e, 0xea, 0xb4, 0x4a, 0x49, 0x2b, - 0xd6, 0x0d, 0x59, 0x68, 0xda, 0x64, 0x29, 0x1f, - 0x85, 0x53, 0x72, 0xf1, 0xc5, 0x88, 0x1a, 0x0b, - 0x4f, 0x96, 0x43, 0xe0, 0x91, 0x89, 0xb9, 0xc0, - 0xe8, 0x18, 0xd5, 0x6e, 0x94, 0xe8, 0x35, 0x66, - 0x01, 0x94, 0x80, 0x95, 0x87, 0xe2, 0xc8, 0x19, - 0x73, 0xa3, 0x01, 0x05, 0xc1, 0x64, 0x72, 0xc9, - 0x6b, 0x6e, 0x55, 0x7c, 0x29, 0x67, 0x90, 0x93, - 0x49, 0xeb, 0xe3, 0x85, 0xc2, 0xf5, 0x79, 0x68, - 0x9d, 0x92, 0xc3, 0x32, 0x75, 0x80, 0x66, 0xf2, - 0x43, 0xa7, 0xb0, 0xc3, 0x22, 0x3f, 0x39, 0x8a, - 0x35, 0x5c, 0x63, 0x5c, 0xd1, 0x9e, 0x8a, 0xd2, - 0x78, 0x3c, 0x12, 0x01, 0x25, 0x04, 0x0e, 0x08, - 0x10, 0x88, 0xb6, 0x1b, 0xb7, 0x96, 0x35, 0xa8, - 0x0d, 0x1e, 0xae, 0xac, 0x4a, 0x70, 0xa5, 0x31, - 0xd0, 0x0c, 0x78, 0xbf, 0xdd, 0xc5, 0x24, 0x3e, - 0xcb, 0x0a, 0x0a, 0x69, 0x40, 0xba, 0xb0, 0xc4, - 0x2a, 0x9b, 0x1e, 0x0a, 0x51, 0xa6, 0x16, 0x98, - 0x76 -#elif defined(TEST_ZSTD2) - 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x58, 0x75, 0x04, - 0x00, 0xb2, 0x4c, 0x20, 0x17, 0xa0, 0x25, 0x69, - 0x03, 0xf0, 0xb2, 0x37, 0xb1, 0x5e, 0xb9, 0x24, - 0x56, 0x5b, 0x52, 0x22, 0x39, 0x01, 0x44, 0x2b, - 0x03, 0x55, 0xe3, 0x47, 0x03, 0x12, 0x9a, 0xe1, - 0xf0, 0x94, 0x0b, 0xe5, 0xe2, 0xba, 0x7e, 0xfe, - 0x9c, 0xc7, 0x61, 0x43, 0xc8, 0xfa, 0xf0, 0x3a, - 0xfa, 0x51, 0xaa, 0x50, 0xa6, 0x2d, 0x9a, 0x78, - 0xce, 0x2f, 0x61, 0x20, 0x6c, 0x7e, 0x35, 0x60, - 0xfb, 0xdd, 0x4c, 0x63, 0xfb, 0x95, 0x35, 0xc0, - 0x82, 0x59, 0xc2, 0xc9, 0x78, 0x6e, 0x30, 0xe6, - 0xd2, 0x72, 0x15, 0x14, 0x18, 0x62, 0x5d, 0xeb, - 0x2d, 0x9d, 0x3e, 0xee, 0x2e, 0x58, 0x58, 0xe9, - 0x40, 0x68, 0xb9, 0x2f, 0x23, 0x99, 0x2a, 0x4d, - 0xe8, 0x49, 0x79, 0x70, 0x1f, 0xf9, 0xe2, 0x34, - 0x2e, 0xab, 0xa5, 0xa3, 0xf2, 0x70, 0x98, 0xd0, - 0xb2, 0xb1, 0x3e, 0x5d, 0x90, 0x20, 0xd9, 0x36, - 0x8b, 0xdb, 0xaa, 0x20, 0x40, 0x03, 0x14, 0x06, - 0x03, 0x16, 0x2a, 0x9d, 0x31, 0xbd, 0x28, 0x3b, - 0x0c, 0xac, 0x41, - 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x58, 0xbd, 0x04, - 0x00, 0x62, 0xcd, 0x22, 0x19, 0xa0, 0x25, 0x69, - 0x03, 0x60, 0x72, 0xc9, 0x36, 0xda, 0xd2, 0x8b, - 0xfc, 0xbf, 0x25, 0x42, 0xa9, 0x82, 0x38, 0x70, - 0x1a, 0x2e, 0x54, 0x95, 0x33, 0x02, 0x03, 0x51, - 0x36, 0x51, 0x80, 0xcc, 0x7a, 0x6e, 0x52, 0x2e, - 0x75, 0x64, 0x2d, 0x33, 0x2c, 0xd6, 0xdb, 0xfc, - 0x39, 0x31, 0xd5, 0xa8, 0xa2, 0x40, 0xd7, 0x12, - 0x4c, 0xc6, 0x76, 0xdc, 0x1e, 0x0f, 0xf4, 0x4e, - 0x0a, 0xd3, 0x0c, 0x87, 0x67, 0x25, 0x25, 0x52, - 0x66, 0x87, 0x95, 0xc6, 0x69, 0x0c, 0xb4, 0x5e, - 0x1d, 0xe7, 0x5e, 0xcd, 0x47, 0x41, 0x80, 0x89, - 0x5c, 0xa5, 0x4a, 0x32, 0x26, 0xb3, 0x3d, 0x2b, - 0xd5, 0xc0, 0x16, 0xde, 0xfb, 0x65, 0xcd, 0x6a, - 0x0c, 0x3f, 0xe7, 0xd6, 0xb2, 0x17, 0x7c, 0x25, - 0x35, 0x6b, 0x58, 0xf0, 0x95, 0xb5, 0xf2, 0xe4, - 0x4e, 0xf0, 0x34, 0x4f, 0x5f, 0x39, 0xd1, 0x90, - 0xf8, 0xb9, 0x59, 0xbe, 0x2e, 0xf9, 0xd4, 0x02, - 0x98, 0x50, 0x5a, 0xc2, 0xcf, 0xe1, 0x08, 0x02, - 0x00, 0x0f, 0x1e, 0x44, 0x40, 0x79, 0x50, 0x67, - 0x3d, 0xd3, 0x35, 0x8f -#endif -}; - -static const char orig[] = -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod\n" -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n" -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n" -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n" -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n" -"proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"; - -#if defined(TEST_BZIP2) || defined(TEST_BZIP22) -#define COMP_NAME "bzip2" -#define COMP_ID FSTREAM_COMPRESSOR_BZIP2 -#elif defined(TEST_XZ) || defined(TEST_XZ2) -#define COMP_NAME "xz" -#define COMP_ID FSTREAM_COMPRESSOR_XZ -#elif defined(TEST_GZIP) -#define COMP_NAME "gzip" -#define COMP_ID FSTREAM_COMPRESSOR_GZIP -#elif defined(TEST_ZSTD) || defined(TEST_ZSTD2) -#define COMP_NAME "zstd" -#define COMP_ID FSTREAM_COMPRESSOR_ZSTD -#endif - -static void destroy_noop(sqfs_object_t *obj) -{ - (void)obj; -} - -static int precache_noop(istream_t *strm) -{ - (void)strm; - return 0; -} - -static const char *get_filename(istream_t *strm) -{ - (void)strm; - return "memstream"; -} - -static istream_t memstream = { - .base = { - .destroy = destroy_noop, - }, - - .buffer_used = sizeof(data_in) / sizeof(data_in[0]), - .buffer_offset = 0, - .eof = true, - .buffer = data_in, - - .precache = precache_noop, - .get_filename = get_filename, -}; - -int main(int argc, char **argv) -{ - char buffer[2 * (sizeof(orig) / sizeof(orig[0]))]; - const char *name; - istream_t *xfrm; - size_t orig_sz; - int ret; - (void)argc; (void)argv; - - /* XXX: null terminator not included in the compressed blob */ - orig_sz = (sizeof(orig) / sizeof(orig[0])) - 1; - - /* generic API test */ - TEST_ASSERT(fstream_compressor_exists(COMP_ID)); - - name = fstream_compressor_name_from_id(COMP_ID); - TEST_STR_EQUAL(name, COMP_NAME); - - ret = fstream_compressor_id_from_name(name); - TEST_EQUAL_I(ret, COMP_ID); - - ret = istream_detect_compressor(&memstream, NULL); - TEST_EQUAL_I(ret, COMP_ID); - - /* decoder test */ - xfrm = istream_compressor_create(&memstream, COMP_ID); - TEST_NOT_NULL(xfrm); - - name = istream_get_filename(xfrm); - TEST_STR_EQUAL(name, "memstream"); - - ret = istream_read(xfrm, buffer, sizeof(buffer)); - TEST_ASSERT(ret > 0); - TEST_EQUAL_UI((size_t)ret, orig_sz); - - ret = memcmp(buffer, orig, ret); - TEST_EQUAL_I(ret, 0); - - ret = istream_read(xfrm, buffer, sizeof(buffer)); - TEST_EQUAL_I(ret, 0); - - /* cleanup */ - sqfs_destroy(xfrm); - return EXIT_SUCCESS; -} diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am index 594ef7e..6b45ece 100644 --- a/tests/libfstree/Makemodule.am +++ b/tests/libfstree/Makemodule.am @@ -28,16 +28,16 @@ test_get_path_LDADD = libfstree.a libcompat.a test_fstree_sort_SOURCES = tests/libfstree/fstree_sort.c tests/test.h test_fstree_sort_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree -test_fstree_sort_LDADD = libfstree.a libfstream.a libcompat.a +test_fstree_sort_LDADD = libfstree.a libio.a libcompat.a test_fstree_from_file_SOURCES = tests/libfstree/fstree_from_file.c tests/test.h test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) test_fstree_from_file_CPPFLAGS += -DTESTPATH=$(FSTDATADIR)/fstree1.txt -test_fstree_from_file_LDADD = libfstree.a libfstream.a libcompat.a +test_fstree_from_file_LDADD = libfstree.a libio.a libcompat.a test_fstree_glob1_SOURCES = tests/libfstree/fstree_glob1.c tests/test.h test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(FSTDATADIR) -test_fstree_glob1_LDADD = libfstree.a libfstream.a libcompat.a +test_fstree_glob1_LDADD = libfstree.a libio.a libcompat.a test_fstree_from_dir_SOURCES = tests/libfstree/fstree_from_dir.c tests/test.h test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS) @@ -46,7 +46,7 @@ test_fstree_from_dir_LDADD = libfstree.a libcompat.a test_fstree_init_SOURCES = tests/libfstree/fstree_init.c tests/test.h test_fstree_init_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree -test_fstree_init_LDADD = libfstree.a libfstream.a libcompat.a +test_fstree_init_LDADD = libfstree.a libio.a libcompat.a test_filename_sane_SOURCES = tests/libfstree/filename_sane.c test_filename_sane_SOURCES += lib/fstree/filename_sane.c @@ -63,10 +63,10 @@ test_fstree_epoch_SOURCES += lib/fstree/source_date_epoch.c test_fstree_epoch_LDADD = libcompat.a test_sort_file_SOURCES = tests/libfstree/sort_file.c -test_sort_file_LDADD = libfstree.a libfstream.a libcompat.a +test_sort_file_LDADD = libfstree.a libio.a libcompat.a fstree_fuzz_SOURCES = tests/libfstree/fstree_fuzz.c -fstree_fuzz_LDADD = libfstree.a libfstream.a libcompat.a +fstree_fuzz_LDADD = libfstree.a libio.a libcompat.a FSTREE_TESTS = \ test_canonicalize_name test_mknode_simple test_mknode_slink \ diff --git a/tests/libio/Makemodule.am b/tests/libio/Makemodule.am new file mode 100644 index 0000000..86f2e3a --- /dev/null +++ b/tests/libio/Makemodule.am @@ -0,0 +1,68 @@ +test_get_line_SOURCES = tests/libio/get_line.c tests/test.h +test_get_line_LDADD = libio.a libcompat.a +test_get_line_CPPFLAGS = $(AM_CPPFLAGS) +test_get_line_CPPFLAGS += -DTESTFILE=$(top_srcdir)/tests/libio/get_line.txt + +test_xfrm_bzip2_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_bzip2_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_bzip2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_BZIP2=1 + +test_xfrm_bzip22_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_bzip22_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_bzip22_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_bzip22_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_BZIP22=1 + +test_xfrm_xz_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_xz_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_xz_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_xz_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_XZ=1 + +test_xfrm_xz2_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_xz2_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_xz2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_xz2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_XZ2=1 + +test_xfrm_gzip_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_gzip_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_gzip_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_GZIP=1 + +test_xfrm_zstd_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_zstd_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_zstd_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_ZSTD=1 + +test_xfrm_zstd2_SOURCES = tests/libio/uncompress.c tests/test.h +test_xfrm_zstd2_LDADD = libio.a libcompat.a $(BZIP2_LIBS) $(ZLIB_LIBS) +test_xfrm_zstd2_LDADD += $(XZ_LIBS) $(ZSTD_LIBS) +test_xfrm_zstd2_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_ZSTD2=1 + +if BUILD_TOOLS +check_PROGRAMS += test_get_line +TESTS += test_get_line + +if WITH_BZIP2 +check_PROGRAMS += test_xfrm_bzip2 test_xfrm_bzip22 +TESTS += test_xfrm_bzip2 test_xfrm_bzip22 +endif + +if WITH_XZ +check_PROGRAMS += test_xfrm_xz test_xfrm_xz2 +TESTS += test_xfrm_xz test_xfrm_xz2 +endif + +if WITH_GZIP +check_PROGRAMS += test_xfrm_gzip +TESTS += test_xfrm_gzip +endif + +if WITH_ZSTD +if HAVE_ZSTD_STREAM +check_PROGRAMS += test_xfrm_zstd test_xfrm_zstd2 +TESTS += test_xfrm_zstd test_xfrm_zstd2 +endif +endif +endif + +EXTRA_DIST += $(top_srcdir)/tests/libio/get_line.txt diff --git a/tests/libio/get_line.c b/tests/libio/get_line.c new file mode 100644 index 0000000..66fced5 --- /dev/null +++ b/tests/libio/get_line.c @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * get_line.c + * + * Copyright (C) 2019 David Oberhollenzer + */ +#include "config.h" + +#include "io/file.h" +#include "../test.h" + +typedef struct { + size_t line_num; + const char *str; +} line_t; + +static void run_test_case(const line_t *lines, size_t count, + int flags) +{ + size_t i, line_num, old_line_num; + istream_t *fp; + char *line; + int ret; + + fp = istream_open_file(STRVALUE(TESTFILE)); + TEST_NOT_NULL(fp); + + line_num = 1; + line = NULL; + + for (i = 0; i < count; ++i) { + old_line_num = line_num; + ret = istream_get_line(fp, &line, &line_num, flags); + + TEST_ASSERT(line_num >= old_line_num); + TEST_EQUAL_I(ret, 0); + TEST_NOT_NULL(line); + + TEST_EQUAL_UI(line_num, lines[i].line_num); + TEST_STR_EQUAL(line, lines[i].str); + + free(line); + line = NULL; + line_num += 1; + } + + ret = istream_get_line(fp, &line, &line_num, flags); + TEST_ASSERT(ret > 0); + + sqfs_destroy(fp); +} + +static const line_t lines_raw[] = { + { 1, "" }, + { 2, "The quick" }, + { 3, " " }, + { 4, " brown fox " }, + { 5, "" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 9, "" }, + { 10, "dog" }, + { 11, "" }, +}; + +static const line_t lines_ltrim[] = { + { 1, "" }, + { 2, "The quick" }, + { 3, "" }, + { 4, "brown fox " }, + { 5, "" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 9, "" }, + { 10, "dog" }, + { 11, "" }, +}; + +static const line_t lines_rtrim[] = { + { 1, "" }, + { 2, "The quick" }, + { 3, "" }, + { 4, " brown fox" }, + { 5, "" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 9, "" }, + { 10, "dog" }, + { 11, "" }, +}; + +static const line_t lines_trim[] = { + { 1, "" }, + { 2, "The quick" }, + { 3, "" }, + { 4, "brown fox" }, + { 5, "" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 9, "" }, + { 10, "dog" }, + { 11, "" }, +}; + +static const line_t lines_no_empty[] = { + { 2, "The quick" }, + { 3, " " }, + { 4, " brown fox " }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 10, "dog" }, +}; + +static const line_t lines_no_empty_ltrim[] = { + { 2, "The quick" }, + { 4, "brown fox " }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 10, "dog" }, +}; + +static const line_t lines_no_empty_rtrim[] = { + { 2, "The quick" }, + { 4, " brown fox" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 10, "dog" }, +}; + +static const line_t lines_no_empty_trim[] = { + { 2, "The quick" }, + { 4, "brown fox" }, + { 6, "jumps over" }, + { 7, "the" }, + { 8, "lazy" }, + { 10, "dog" }, +}; + +int main(int argc, char **argv) +{ + (void)argc; (void)argv; + + run_test_case(lines_raw, 11, 0); + run_test_case(lines_ltrim, 11, ISTREAM_LINE_LTRIM); + run_test_case(lines_rtrim, 11, ISTREAM_LINE_RTRIM); + run_test_case(lines_trim, 11, + ISTREAM_LINE_LTRIM | ISTREAM_LINE_RTRIM); + + run_test_case(lines_no_empty, 7, ISTREAM_LINE_SKIP_EMPTY); + run_test_case(lines_no_empty_ltrim, 6, + ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM); + run_test_case(lines_no_empty_rtrim, 6, + ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_RTRIM); + run_test_case(lines_no_empty_trim, 6, + ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM | + ISTREAM_LINE_RTRIM); + + return EXIT_SUCCESS; +} diff --git a/tests/libio/get_line.txt b/tests/libio/get_line.txt new file mode 100644 index 0000000..a1994f0 --- /dev/null +++ b/tests/libio/get_line.txt @@ -0,0 +1,11 @@ + +The quick + + brown fox + +jumps over +the +lazy + +dog + diff --git a/tests/libio/uncompress.c b/tests/libio/uncompress.c new file mode 100644 index 0000000..9476877 --- /dev/null +++ b/tests/libio/uncompress.c @@ -0,0 +1,432 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * uncompress.c + * + * Copyright (C) 2021 David Oberhollenzer + */ +#include "io/istream.h" +#include "io/xfrm.h" +#include "../test.h" + +static sqfs_u8 data_in[] = { +#if defined(TEST_BZIP2) + 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0x05, 0x24, 0x28, 0x04, 0x00, 0x00, + 0x27, 0xd7, 0x80, 0x00, 0x10, 0x40, 0x05, 0x06, + 0x04, 0x02, 0x00, 0x3f, 0xe7, 0xff, 0x40, 0x30, + 0x01, 0x2d, 0x23, 0x62, 0x26, 0x05, 0x3d, 0x03, + 0x54, 0xfd, 0x53, 0x4c, 0x86, 0x9e, 0x90, 0x6a, + 0x9e, 0x9e, 0x85, 0x3c, 0xa0, 0x00, 0x00, 0x1a, + 0x9e, 0x41, 0x13, 0x13, 0x28, 0x69, 0x03, 0xd4, + 0x0f, 0x1c, 0x70, 0xd0, 0xb4, 0xe3, 0xe4, 0x75, + 0x4e, 0x8b, 0x67, 0x43, 0x7b, 0x38, 0x27, 0x77, + 0xe4, 0xc1, 0x98, 0x3a, 0x2d, 0x3a, 0xe4, 0x44, + 0x98, 0xdc, 0x49, 0x8b, 0x22, 0x48, 0xfc, 0xc8, + 0xe7, 0x57, 0x05, 0x3c, 0x5a, 0xee, 0x5a, 0x84, + 0xcd, 0x7c, 0x8f, 0x26, 0x6b, 0x6e, 0xf7, 0xb5, + 0x49, 0x1f, 0x79, 0x42, 0x5d, 0x09, 0x8c, 0xc6, + 0xde, 0x0c, 0x0d, 0xb1, 0x46, 0xb4, 0xee, 0xd9, + 0x8f, 0x33, 0x37, 0x04, 0xa9, 0x05, 0x49, 0xe3, + 0x04, 0x16, 0x62, 0x36, 0x3a, 0x01, 0xda, 0xd4, + 0xc8, 0x8a, 0x32, 0x02, 0x1f, 0x62, 0x4b, 0xa4, + 0x49, 0x59, 0xda, 0x50, 0x85, 0x69, 0x35, 0x21, + 0x10, 0xc6, 0x8a, 0x3c, 0x44, 0x95, 0xb0, 0xbc, + 0xc5, 0x6b, 0xea, 0xfb, 0x40, 0xbd, 0x14, 0x01, + 0x6a, 0xfa, 0xcd, 0x67, 0xd8, 0x2d, 0x93, 0x8b, + 0xda, 0x44, 0x1b, 0xe9, 0x5a, 0x87, 0x60, 0xb0, + 0xe0, 0x73, 0xd1, 0x01, 0x3a, 0x66, 0x05, 0xcc, + 0x34, 0xa0, 0x63, 0x8d, 0x35, 0x5e, 0xa0, 0x9f, + 0x05, 0x89, 0x15, 0x51, 0x48, 0x16, 0x0c, 0x61, + 0xf4, 0x30, 0xb8, 0x07, 0x29, 0xc0, 0xf5, 0x1a, + 0xe1, 0x0d, 0x6c, 0xfe, 0x91, 0xda, 0x13, 0x2f, + 0x8e, 0x5b, 0x1c, 0xfc, 0xb3, 0xb2, 0x30, 0x9d, + 0xf6, 0x09, 0x30, 0x55, 0x30, 0x67, 0xc2, 0x87, + 0xe9, 0x9a, 0xd4, 0x1d, 0x66, 0x11, 0x54, 0x89, + 0x21, 0xe1, 0x55, 0x84, 0xbf, 0xa6, 0x11, 0xa4, + 0xb8, 0x40, 0xed, 0x42, 0x20, 0xb9, 0xb7, 0x26, + 0x31, 0x14, 0x4f, 0x86, 0xdc, 0x50, 0x34, 0x38, + 0x8b, 0x57, 0x77, 0x21, 0xf6, 0x89, 0xbd, 0xc5, + 0x65, 0xc3, 0x23, 0x45, 0xec, 0x7f, 0x8b, 0xb9, + 0x22, 0x9c, 0x28, 0x48, 0x02, 0x92, 0x14, 0x02, + 0x00, +#elif defined(TEST_BZIP22) + 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0x5d, 0x09, 0x24, 0x1d, 0x00, 0x00, + 0x13, 0xd7, 0x80, 0x00, 0x10, 0x40, 0x05, 0x00, + 0x04, 0x02, 0x00, 0x3e, 0xa7, 0xff, 0x40, 0x30, + 0x00, 0xac, 0x43, 0x54, 0xf5, 0x36, 0x4c, 0xa7, + 0xa8, 0xd3, 0x6a, 0x60, 0x81, 0x40, 0x00, 0xd0, + 0x32, 0x64, 0x0d, 0x53, 0xda, 0x02, 0x09, 0xa2, + 0x68, 0x34, 0xd1, 0x27, 0x4a, 0xdd, 0xf2, 0x0a, + 0x73, 0x43, 0xf9, 0xa2, 0x51, 0x85, 0x76, 0x45, + 0x9a, 0x68, 0x3a, 0xe7, 0x0d, 0xc0, 0x21, 0x4a, + 0xc4, 0xf9, 0xf7, 0x40, 0xc3, 0x10, 0xb2, 0x9b, + 0x58, 0x56, 0x71, 0x50, 0x2f, 0xa4, 0xc5, 0x61, + 0x19, 0xf6, 0x59, 0x06, 0x82, 0x03, 0x7f, 0xeb, + 0xd2, 0x61, 0x88, 0xcd, 0xe8, 0xf7, 0xe8, 0x87, + 0x59, 0x9d, 0xe1, 0xf8, 0x19, 0x6e, 0xad, 0x77, + 0xbf, 0x34, 0x17, 0x21, 0x6b, 0x91, 0xc9, 0x52, + 0xd0, 0x81, 0x1e, 0xb5, 0x0b, 0xee, 0x42, 0x84, + 0x80, 0xd5, 0xa1, 0x8a, 0x04, 0x18, 0x4d, 0xf3, + 0xda, 0x7e, 0x3c, 0x40, 0xa4, 0xdb, 0xe5, 0xf0, + 0x37, 0x40, 0x3a, 0x7d, 0xa7, 0x45, 0x21, 0xf2, + 0x5a, 0x7b, 0x59, 0x56, 0x16, 0xd5, 0xac, 0x9f, + 0x60, 0x85, 0x0e, 0xf5, 0x73, 0xd9, 0x47, 0xe2, + 0xee, 0x48, 0xa7, 0x0a, 0x12, 0x0b, 0xa1, 0x24, + 0x83, 0xa0, + 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0x2c, 0x24, 0x39, 0xa0, 0x00, 0x00, + 0x1f, 0x55, 0x80, 0x00, 0x10, 0x40, 0x05, 0x06, + 0x00, 0x3f, 0xe7, 0xff, 0x40, 0x30, 0x00, 0xb5, + 0x91, 0x13, 0x4f, 0x54, 0x7a, 0x6a, 0x6d, 0x4d, + 0xa2, 0x68, 0x0c, 0x84, 0x53, 0xf5, 0x30, 0x89, + 0xa3, 0xd4, 0x0d, 0x0f, 0x49, 0xa0, 0xd4, 0xf4, + 0xd1, 0x53, 0xf4, 0x93, 0x69, 0x3c, 0x81, 0x1a, + 0x65, 0x53, 0x90, 0x51, 0x07, 0x2a, 0xad, 0x8f, + 0x63, 0xba, 0x25, 0xc2, 0x0c, 0x8b, 0xb9, 0x95, + 0x15, 0xd8, 0xda, 0x61, 0x5c, 0xa9, 0xe4, 0x0b, + 0x21, 0xc9, 0x97, 0x57, 0x01, 0x28, 0x9b, 0xfb, + 0x94, 0xb9, 0x48, 0xa3, 0x0a, 0xc6, 0x1c, 0x54, + 0x98, 0x9a, 0x39, 0xc3, 0x87, 0x90, 0x33, 0x58, + 0x2d, 0x3e, 0x16, 0xb1, 0xae, 0x26, 0x89, 0x75, + 0xf5, 0x77, 0xa5, 0x8e, 0x5b, 0x8c, 0x8a, 0x39, + 0xbd, 0x75, 0x21, 0x9d, 0x99, 0x18, 0x4a, 0x91, + 0xab, 0xbc, 0x08, 0x87, 0xa4, 0xf1, 0x81, 0xb5, + 0xb4, 0xb0, 0xfe, 0x6b, 0x9f, 0xbe, 0x19, 0x82, + 0xd1, 0x50, 0xe1, 0x5e, 0x13, 0xb5, 0xc6, 0x2c, + 0xa4, 0x82, 0xf2, 0x5c, 0xc3, 0x20, 0x41, 0x13, + 0x56, 0x63, 0x3d, 0xec, 0x71, 0x2a, 0xbf, 0x2c, + 0x60, 0x2f, 0x7a, 0x4d, 0xcb, 0x3f, 0x8b, 0xb9, + 0x22, 0x9c, 0x28, 0x48, 0x16, 0x12, 0x1c, 0xd0, + 0x00, +#elif defined(TEST_XZ) + 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x00, + 0xff, 0x12, 0xd9, 0x41, 0x02, 0x00, 0x21, 0x01, + 0x1c, 0x00, 0x00, 0x00, 0x10, 0xcf, 0x58, 0xcc, + 0xe0, 0x01, 0xbd, 0x01, 0x43, 0x5d, 0x00, 0x26, + 0x1b, 0xca, 0x46, 0x67, 0x5a, 0xf2, 0x77, 0xb8, + 0x7d, 0x86, 0xd8, 0x41, 0xdb, 0x05, 0x35, 0xcd, + 0x83, 0xa5, 0x7c, 0x12, 0xa5, 0x05, 0xdb, 0x90, + 0xbd, 0x2f, 0x14, 0xd3, 0x71, 0x72, 0x96, 0xa8, + 0x8a, 0x7d, 0x84, 0x56, 0x71, 0x8d, 0x6a, 0x22, + 0x98, 0xab, 0x9e, 0x3d, 0xc3, 0x55, 0xef, 0xcc, + 0xa5, 0xc3, 0xdd, 0x5b, 0x8e, 0xbf, 0x03, 0x81, + 0x21, 0x40, 0xd6, 0x26, 0x91, 0x02, 0x45, 0x4e, + 0x20, 0x91, 0xcf, 0x8c, 0x51, 0x22, 0x02, 0x70, + 0xba, 0x05, 0x6b, 0x83, 0xef, 0x3f, 0x8e, 0x09, + 0xef, 0x88, 0xf5, 0x37, 0x1b, 0x89, 0x8d, 0xff, + 0x1e, 0xee, 0xe8, 0xb0, 0xac, 0xf2, 0x6e, 0xd4, + 0x3e, 0x25, 0xaf, 0xa0, 0x6d, 0x2e, 0xc0, 0x7f, + 0xb5, 0xa0, 0xcb, 0x90, 0x1f, 0x08, 0x1a, 0xe2, + 0x90, 0x20, 0x19, 0x71, 0x0c, 0xe8, 0x3f, 0xe5, + 0x39, 0xeb, 0x9a, 0x62, 0x4f, 0x06, 0xda, 0x3c, + 0x32, 0x59, 0xcc, 0x83, 0xe3, 0x83, 0x0f, 0x38, + 0x7d, 0x43, 0x37, 0x6c, 0x0b, 0x05, 0x65, 0x98, + 0x25, 0xdb, 0xf2, 0xc0, 0x2d, 0x39, 0x36, 0x5d, + 0xd4, 0xb6, 0xc2, 0x79, 0x73, 0x3e, 0xc2, 0x6e, + 0x54, 0xec, 0x78, 0x2b, 0x5d, 0xf1, 0xd1, 0xb4, + 0xb3, 0xcd, 0xf3, 0x89, 0xf5, 0x81, 0x3e, 0x2c, + 0x65, 0xd6, 0x73, 0xd3, 0x1b, 0x20, 0x68, 0x0c, + 0x93, 0xd4, 0xfc, 0x9f, 0xf8, 0xa7, 0xd4, 0xfa, + 0x3a, 0xb1, 0x13, 0x93, 0x4b, 0xec, 0x78, 0x7d, + 0x5c, 0x81, 0x80, 0xe5, 0x14, 0x78, 0xfe, 0x7e, + 0xde, 0xf7, 0xad, 0x9e, 0x84, 0xba, 0xf1, 0x00, + 0xe9, 0xbd, 0x2c, 0xf4, 0x70, 0x7d, 0xbe, 0x29, + 0xb9, 0xf0, 0x10, 0xb9, 0x01, 0xf1, 0x76, 0x8a, + 0x5a, 0xad, 0x02, 0xa1, 0x32, 0xc8, 0x53, 0x59, + 0x11, 0x4c, 0xe2, 0x98, 0x34, 0xd9, 0x23, 0x51, + 0x4a, 0x40, 0x2b, 0x87, 0x41, 0xdd, 0x50, 0xcd, + 0x98, 0x1e, 0x29, 0x86, 0x23, 0x93, 0x3e, 0x9b, + 0x6b, 0x16, 0xa1, 0x40, 0xac, 0xe7, 0x40, 0xfe, + 0xa9, 0x87, 0x48, 0x25, 0x52, 0x02, 0x8b, 0xc4, + 0x68, 0x08, 0x5a, 0x62, 0xc1, 0xb2, 0x07, 0x3b, + 0x26, 0x1e, 0x59, 0x5c, 0x47, 0x24, 0xae, 0x8e, + 0xe5, 0xf7, 0xe6, 0x4b, 0x13, 0xb4, 0x6d, 0x46, + 0x65, 0x4f, 0xd0, 0x48, 0xcc, 0x51, 0x4b, 0x80, + 0xcb, 0xf1, 0xd4, 0x6c, 0x45, 0x98, 0x92, 0x47, + 0xeb, 0x60, 0x00, 0x00, 0x00, 0x01, 0xd7, 0x02, + 0xbe, 0x03, 0x00, 0x00, 0xda, 0x2c, 0x45, 0x49, + 0xa8, 0x00, 0x0a, 0xfc, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x59, 0x5a +#elif defined(TEST_XZ2) + 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04, + 0xe6, 0xd6, 0xb4, 0x46, 0x02, 0x00, 0x21, 0x01, + 0x16, 0x00, 0x00, 0x00, 0x74, 0x2f, 0xe5, 0xa3, + 0xe0, 0x00, 0xdc, 0x00, 0xb3, 0x5d, 0x00, 0x26, + 0x1b, 0xca, 0x46, 0x67, 0x5a, 0xf2, 0x77, 0xb8, + 0x7d, 0x86, 0xd8, 0x41, 0xdb, 0x05, 0x35, 0xcd, + 0x83, 0xa5, 0x7c, 0x12, 0xa5, 0x05, 0xdb, 0x90, + 0xbd, 0x2f, 0x14, 0xd3, 0x71, 0x72, 0x96, 0xa8, + 0x8a, 0x7d, 0x84, 0x56, 0x71, 0x8d, 0x6a, 0x22, + 0x98, 0xab, 0x9e, 0x3d, 0xc3, 0x55, 0xef, 0xcc, + 0xa5, 0xc3, 0xdd, 0x5b, 0x8e, 0xbf, 0x03, 0x81, + 0x21, 0x40, 0xd6, 0x26, 0x91, 0x02, 0x45, 0x4e, + 0x20, 0x91, 0xcf, 0x8c, 0x51, 0x22, 0x02, 0x70, + 0xba, 0x05, 0x6b, 0x83, 0xef, 0x3f, 0x8e, 0x09, + 0xef, 0x88, 0xf5, 0x37, 0x1b, 0x89, 0x8d, 0xff, + 0x1e, 0xee, 0xe8, 0xb0, 0xac, 0xf2, 0x6e, 0xd4, + 0x3e, 0x25, 0xaf, 0xa0, 0x6d, 0x2e, 0xc0, 0x7f, + 0xb5, 0xa0, 0xcb, 0x90, 0x1f, 0x08, 0x1a, 0xe2, + 0x90, 0x20, 0x19, 0x71, 0x0c, 0xe8, 0x3f, 0xe5, + 0x39, 0xeb, 0x9a, 0x62, 0x4f, 0x06, 0xda, 0x3c, + 0x32, 0x59, 0xcc, 0x83, 0xe3, 0x83, 0x0f, 0x38, + 0x7d, 0x43, 0x37, 0x6c, 0x0b, 0x05, 0x65, 0x98, + 0x25, 0xdb, 0xf2, 0xc0, 0x2d, 0x39, 0x36, 0x5d, + 0xd4, 0xb6, 0xc2, 0x79, 0x73, 0x3e, 0xc2, 0x6e, + 0x54, 0xec, 0x78, 0x2b, 0x5d, 0xf1, 0xd1, 0xb4, + 0xb3, 0xcd, 0xf3, 0x89, 0xf5, 0x80, 0x79, 0x46, + 0xc0, 0x00, 0x00, 0x00, 0xc4, 0xf5, 0x1d, 0x08, + 0xf0, 0x34, 0x3a, 0x59, 0x00, 0x01, 0xcf, 0x01, + 0xdd, 0x01, 0x00, 0x00, 0x7f, 0x5a, 0x77, 0xcb, + 0xb1, 0xc4, 0x67, 0xfb, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x59, 0x5a, + 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04, + 0xe6, 0xd6, 0xb4, 0x46, 0x02, 0x00, 0x21, 0x01, + 0x16, 0x00, 0x00, 0x00, 0x74, 0x2f, 0xe5, 0xa3, + 0xe0, 0x00, 0xe0, 0x00, 0xb7, 0x5d, 0x00, 0x31, + 0x9b, 0xca, 0x19, 0xc5, 0x54, 0xec, 0xb6, 0x54, + 0xe7, 0xb1, 0x7d, 0xc4, 0x57, 0x9e, 0x6c, 0x89, + 0xad, 0x4a, 0x6d, 0x16, 0xd8, 0x3c, 0x05, 0x94, + 0x10, 0x16, 0x99, 0x38, 0x21, 0xa3, 0xb9, 0xc5, + 0x80, 0xff, 0xfc, 0xee, 0xd4, 0xd5, 0x3f, 0xdd, + 0x8c, 0xd7, 0x3d, 0x8f, 0x76, 0xec, 0x96, 0x9d, + 0x20, 0xac, 0xcb, 0x18, 0xf5, 0xb2, 0x9c, 0x12, + 0xf6, 0x7c, 0x33, 0xdc, 0x4f, 0x9a, 0xe5, 0x2d, + 0x63, 0x68, 0xa4, 0x2b, 0x1d, 0x0a, 0x1e, 0xf0, + 0xfe, 0x73, 0xf2, 0x5f, 0x7b, 0xb4, 0xea, 0x54, + 0xad, 0x27, 0xd1, 0xff, 0xb6, 0x50, 0x06, 0x7b, + 0x51, 0x3f, 0x25, 0x8a, 0xcf, 0x4c, 0x03, 0x3e, + 0xc3, 0xad, 0x47, 0x34, 0xcf, 0xba, 0x45, 0x79, + 0xd0, 0x7b, 0xf6, 0x66, 0x63, 0xc0, 0xc6, 0x69, + 0xa7, 0x51, 0x84, 0xa8, 0xa0, 0x0b, 0xbc, 0x6f, + 0x13, 0x89, 0xd6, 0x5e, 0xac, 0xca, 0x2f, 0xd2, + 0xe7, 0xe1, 0x1e, 0x78, 0x22, 0x3a, 0x59, 0x6c, + 0x9c, 0x8c, 0x65, 0xf1, 0x5b, 0xf4, 0xbf, 0xd5, + 0xdc, 0x05, 0xeb, 0x70, 0x10, 0xb8, 0x6c, 0xf2, + 0x13, 0x20, 0xb0, 0xdd, 0x3e, 0xb2, 0x92, 0x5b, + 0xa3, 0xf7, 0x94, 0xa1, 0xa1, 0x74, 0x36, 0x9a, + 0xf1, 0xd8, 0xc2, 0xf0, 0xc6, 0x29, 0x7e, 0x85, + 0x28, 0xf5, 0xf2, 0x21, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x80, 0x67, 0x40, 0xc3, 0xaa, 0x17, 0x57, + 0x00, 0x01, 0xd3, 0x01, 0xe1, 0x01, 0x00, 0x00, + 0x86, 0xdf, 0x9e, 0x05, 0xb1, 0xc4, 0x67, 0xfb, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x59, 0x5a +#elif defined(TEST_GZIP) + 0x1f, 0x8b, 0x08, 0x08, 0x82, 0xd4, 0x97, 0x60, + 0x00, 0x03, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, + 0x78, 0x74, 0x00, 0x35, 0x90, 0xc1, 0x71, 0x43, + 0x31, 0x08, 0x44, 0xef, 0xbf, 0x8a, 0x2d, 0x20, + 0xf3, 0xab, 0x48, 0x6e, 0xb9, 0xa6, 0x00, 0x82, + 0xb0, 0xc3, 0x8c, 0x24, 0x64, 0x09, 0x3c, 0x2e, + 0x3f, 0xc8, 0x4e, 0x6e, 0x42, 0xc0, 0xb2, 0xfb, + 0x3e, 0x6d, 0x4a, 0x83, 0x8e, 0x15, 0x0d, 0xc5, + 0xaa, 0x4d, 0x2c, 0x75, 0x50, 0x13, 0x7f, 0x03, + 0x5b, 0x5f, 0xc2, 0x2e, 0x1e, 0x13, 0x54, 0x74, + 0xe8, 0x62, 0xed, 0x57, 0x48, 0xd5, 0x6c, 0x2e, + 0x29, 0xb9, 0x00, 0xd1, 0x58, 0xcd, 0xca, 0xe1, + 0xd2, 0x46, 0x2e, 0x6b, 0x67, 0x2d, 0x5a, 0xa2, + 0x3b, 0xc2, 0x51, 0xe9, 0x3b, 0xe5, 0x21, 0xfe, + 0x92, 0x16, 0x34, 0xba, 0x76, 0x02, 0x55, 0xbd, + 0x05, 0x9d, 0xf8, 0x72, 0x48, 0xd7, 0x96, 0xda, + 0x68, 0xba, 0x1f, 0xf7, 0x2c, 0xa9, 0xbd, 0x1d, + 0xb7, 0xd0, 0x85, 0x6e, 0xcb, 0x67, 0x14, 0xc8, + 0x43, 0x26, 0xab, 0x93, 0xab, 0x75, 0x44, 0xad, + 0xd4, 0xd8, 0x5e, 0xca, 0x7b, 0x48, 0x97, 0xee, + 0x4b, 0x4f, 0x49, 0x1d, 0x39, 0x0c, 0xa1, 0x34, + 0xde, 0xd2, 0x93, 0x1d, 0xcf, 0x00, 0x79, 0xca, + 0x4f, 0xbc, 0x6f, 0x49, 0x0a, 0x17, 0xe8, 0x8c, + 0x74, 0xf2, 0xca, 0xaa, 0x1d, 0x53, 0xc6, 0x94, + 0x1f, 0xe9, 0x45, 0x66, 0x06, 0xcf, 0x8f, 0xbb, + 0xd5, 0x18, 0x79, 0x4e, 0xd2, 0x4e, 0x26, 0x85, + 0xac, 0x25, 0x07, 0x6b, 0xad, 0xff, 0x84, 0x32, + 0x50, 0xe0, 0x12, 0x57, 0x25, 0x47, 0xdf, 0x86, + 0x30, 0x68, 0x66, 0x11, 0xf3, 0xc4, 0xc7, 0x83, + 0x65, 0xb8, 0xc4, 0xc6, 0x98, 0x0c, 0x8c, 0x99, + 0x84, 0x73, 0x8e, 0x63, 0x68, 0x21, 0xdf, 0x1b, + 0xd6, 0x8f, 0x31, 0x4d, 0x8b, 0xf4, 0x4d, 0x71, + 0x93, 0xca, 0xa3, 0x1c, 0x75, 0x10, 0x32, 0x02, + 0xec, 0x72, 0x51, 0x56, 0x42, 0x91, 0x25, 0x73, + 0x77, 0x9b, 0xd5, 0x6d, 0x83, 0x36, 0x20, 0x4d, + 0x1c, 0xeb, 0x8f, 0x6b, 0xb4, 0xf3, 0xf8, 0x05, + 0x6b, 0x8b, 0x8b, 0x20, 0xbe, 0x01, 0x00, 0x00 +#elif defined(TEST_ZSTD) + 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x88, 0xa5, 0x08, + 0x00, 0x46, 0x97, 0x3a, 0x1a, 0x80, 0x37, 0xcd, + 0x01, 0xc0, 0x8a, 0xec, 0xfe, 0x2d, 0xf2, 0xb9, + 0x44, 0x6b, 0xb9, 0x24, 0x77, 0x56, 0x5a, 0x33, + 0x17, 0x0b, 0x67, 0x83, 0x2e, 0x47, 0x07, 0x31, + 0x00, 0x32, 0x00, 0x33, 0x00, 0xc5, 0x2c, 0x5a, + 0x92, 0x93, 0x0f, 0x7b, 0xd1, 0x1d, 0x63, 0x2c, + 0xc8, 0x99, 0x94, 0x77, 0x8f, 0x94, 0x38, 0x75, + 0x80, 0x2f, 0xae, 0xc1, 0x3e, 0xd2, 0xcf, 0x49, + 0x15, 0x25, 0x1a, 0x87, 0x93, 0xdd, 0xe8, 0x00, + 0x6d, 0xaa, 0xf8, 0x54, 0x74, 0xe5, 0x48, 0x4d, + 0xa6, 0xf3, 0x1a, 0xa3, 0x13, 0x08, 0xe5, 0x26, + 0xdc, 0x73, 0xcc, 0x3e, 0xfd, 0x86, 0xa9, 0x52, + 0xb2, 0x76, 0xc7, 0xc2, 0x0f, 0xe4, 0x84, 0x4b, + 0x12, 0x61, 0x3a, 0x6b, 0x7a, 0x1e, 0x8a, 0x81, + 0xa9, 0x9b, 0x11, 0x37, 0x25, 0x55, 0x73, 0x73, + 0x71, 0xa0, 0x84, 0xca, 0xc3, 0x4b, 0xb5, 0xcc, + 0x50, 0xa6, 0x46, 0xd7, 0xe8, 0x08, 0xaa, 0x04, + 0x28, 0xb1, 0x8e, 0xea, 0xb4, 0x4a, 0x49, 0x2b, + 0xd6, 0x0d, 0x59, 0x68, 0xda, 0x64, 0x29, 0x1f, + 0x85, 0x53, 0x72, 0xf1, 0xc5, 0x88, 0x1a, 0x0b, + 0x4f, 0x96, 0x43, 0xe0, 0x91, 0x89, 0xb9, 0xc0, + 0xe8, 0x18, 0xd5, 0x6e, 0x94, 0xe8, 0x35, 0x66, + 0x01, 0x94, 0x80, 0x95, 0x87, 0xe2, 0xc8, 0x19, + 0x73, 0xa3, 0x01, 0x05, 0xc1, 0x64, 0x72, 0xc9, + 0x6b, 0x6e, 0x55, 0x7c, 0x29, 0x67, 0x90, 0x93, + 0x49, 0xeb, 0xe3, 0x85, 0xc2, 0xf5, 0x79, 0x68, + 0x9d, 0x92, 0xc3, 0x32, 0x75, 0x80, 0x66, 0xf2, + 0x43, 0xa7, 0xb0, 0xc3, 0x22, 0x3f, 0x39, 0x8a, + 0x35, 0x5c, 0x63, 0x5c, 0xd1, 0x9e, 0x8a, 0xd2, + 0x78, 0x3c, 0x12, 0x01, 0x25, 0x04, 0x0e, 0x08, + 0x10, 0x88, 0xb6, 0x1b, 0xb7, 0x96, 0x35, 0xa8, + 0x0d, 0x1e, 0xae, 0xac, 0x4a, 0x70, 0xa5, 0x31, + 0xd0, 0x0c, 0x78, 0xbf, 0xdd, 0xc5, 0x24, 0x3e, + 0xcb, 0x0a, 0x0a, 0x69, 0x40, 0xba, 0xb0, 0xc4, + 0x2a, 0x9b, 0x1e, 0x0a, 0x51, 0xa6, 0x16, 0x98, + 0x76 +#elif defined(TEST_ZSTD2) + 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x58, 0x75, 0x04, + 0x00, 0xb2, 0x4c, 0x20, 0x17, 0xa0, 0x25, 0x69, + 0x03, 0xf0, 0xb2, 0x37, 0xb1, 0x5e, 0xb9, 0x24, + 0x56, 0x5b, 0x52, 0x22, 0x39, 0x01, 0x44, 0x2b, + 0x03, 0x55, 0xe3, 0x47, 0x03, 0x12, 0x9a, 0xe1, + 0xf0, 0x94, 0x0b, 0xe5, 0xe2, 0xba, 0x7e, 0xfe, + 0x9c, 0xc7, 0x61, 0x43, 0xc8, 0xfa, 0xf0, 0x3a, + 0xfa, 0x51, 0xaa, 0x50, 0xa6, 0x2d, 0x9a, 0x78, + 0xce, 0x2f, 0x61, 0x20, 0x6c, 0x7e, 0x35, 0x60, + 0xfb, 0xdd, 0x4c, 0x63, 0xfb, 0x95, 0x35, 0xc0, + 0x82, 0x59, 0xc2, 0xc9, 0x78, 0x6e, 0x30, 0xe6, + 0xd2, 0x72, 0x15, 0x14, 0x18, 0x62, 0x5d, 0xeb, + 0x2d, 0x9d, 0x3e, 0xee, 0x2e, 0x58, 0x58, 0xe9, + 0x40, 0x68, 0xb9, 0x2f, 0x23, 0x99, 0x2a, 0x4d, + 0xe8, 0x49, 0x79, 0x70, 0x1f, 0xf9, 0xe2, 0x34, + 0x2e, 0xab, 0xa5, 0xa3, 0xf2, 0x70, 0x98, 0xd0, + 0xb2, 0xb1, 0x3e, 0x5d, 0x90, 0x20, 0xd9, 0x36, + 0x8b, 0xdb, 0xaa, 0x20, 0x40, 0x03, 0x14, 0x06, + 0x03, 0x16, 0x2a, 0x9d, 0x31, 0xbd, 0x28, 0x3b, + 0x0c, 0xac, 0x41, + 0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x58, 0xbd, 0x04, + 0x00, 0x62, 0xcd, 0x22, 0x19, 0xa0, 0x25, 0x69, + 0x03, 0x60, 0x72, 0xc9, 0x36, 0xda, 0xd2, 0x8b, + 0xfc, 0xbf, 0x25, 0x42, 0xa9, 0x82, 0x38, 0x70, + 0x1a, 0x2e, 0x54, 0x95, 0x33, 0x02, 0x03, 0x51, + 0x36, 0x51, 0x80, 0xcc, 0x7a, 0x6e, 0x52, 0x2e, + 0x75, 0x64, 0x2d, 0x33, 0x2c, 0xd6, 0xdb, 0xfc, + 0x39, 0x31, 0xd5, 0xa8, 0xa2, 0x40, 0xd7, 0x12, + 0x4c, 0xc6, 0x76, 0xdc, 0x1e, 0x0f, 0xf4, 0x4e, + 0x0a, 0xd3, 0x0c, 0x87, 0x67, 0x25, 0x25, 0x52, + 0x66, 0x87, 0x95, 0xc6, 0x69, 0x0c, 0xb4, 0x5e, + 0x1d, 0xe7, 0x5e, 0xcd, 0x47, 0x41, 0x80, 0x89, + 0x5c, 0xa5, 0x4a, 0x32, 0x26, 0xb3, 0x3d, 0x2b, + 0xd5, 0xc0, 0x16, 0xde, 0xfb, 0x65, 0xcd, 0x6a, + 0x0c, 0x3f, 0xe7, 0xd6, 0xb2, 0x17, 0x7c, 0x25, + 0x35, 0x6b, 0x58, 0xf0, 0x95, 0xb5, 0xf2, 0xe4, + 0x4e, 0xf0, 0x34, 0x4f, 0x5f, 0x39, 0xd1, 0x90, + 0xf8, 0xb9, 0x59, 0xbe, 0x2e, 0xf9, 0xd4, 0x02, + 0x98, 0x50, 0x5a, 0xc2, 0xcf, 0xe1, 0x08, 0x02, + 0x00, 0x0f, 0x1e, 0x44, 0x40, 0x79, 0x50, 0x67, + 0x3d, 0xd3, 0x35, 0x8f +#endif +}; + +static const char orig[] = +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod\n" +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n" +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n" +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n" +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n" +"proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"; + +#if defined(TEST_BZIP2) || defined(TEST_BZIP22) +#define COMP_NAME "bzip2" +#define COMP_ID IO_COMPRESSOR_BZIP2 +#elif defined(TEST_XZ) || defined(TEST_XZ2) +#define COMP_NAME "xz" +#define COMP_ID IO_COMPRESSOR_XZ +#elif defined(TEST_GZIP) +#define COMP_NAME "gzip" +#define COMP_ID IO_COMPRESSOR_GZIP +#elif defined(TEST_ZSTD) || defined(TEST_ZSTD2) +#define COMP_NAME "zstd" +#define COMP_ID IO_COMPRESSOR_ZSTD +#endif + +static void destroy_noop(sqfs_object_t *obj) +{ + (void)obj; +} + +static int precache_noop(istream_t *strm) +{ + (void)strm; + return 0; +} + +static const char *get_filename(istream_t *strm) +{ + (void)strm; + return "memstream"; +} + +static istream_t memstream = { + .base = { + .destroy = destroy_noop, + }, + + .buffer_used = sizeof(data_in) / sizeof(data_in[0]), + .buffer_offset = 0, + .eof = true, + .buffer = data_in, + + .precache = precache_noop, + .get_filename = get_filename, +}; + +int main(int argc, char **argv) +{ + char buffer[2 * (sizeof(orig) / sizeof(orig[0]))]; + const char *name; + istream_t *xfrm; + size_t orig_sz; + int ret; + (void)argc; (void)argv; + + /* XXX: null terminator not included in the compressed blob */ + orig_sz = (sizeof(orig) / sizeof(orig[0])) - 1; + + /* generic API test */ + TEST_ASSERT(io_compressor_exists(COMP_ID)); + + name = io_compressor_name_from_id(COMP_ID); + TEST_STR_EQUAL(name, COMP_NAME); + + ret = io_compressor_id_from_name(name); + TEST_EQUAL_I(ret, COMP_ID); + + ret = istream_detect_compressor(&memstream, NULL); + TEST_EQUAL_I(ret, COMP_ID); + + /* decoder test */ + xfrm = istream_compressor_create(&memstream, COMP_ID); + TEST_NOT_NULL(xfrm); + + name = istream_get_filename(xfrm); + TEST_STR_EQUAL(name, "memstream"); + + ret = istream_read(xfrm, buffer, sizeof(buffer)); + TEST_ASSERT(ret > 0); + TEST_EQUAL_UI((size_t)ret, orig_sz); + + ret = memcmp(buffer, orig, ret); + TEST_EQUAL_I(ret, 0); + + ret = istream_read(xfrm, buffer, sizeof(buffer)); + TEST_EQUAL_I(ret, 0); + + /* cleanup */ + sqfs_destroy(xfrm); + return EXIT_SUCCESS; +} diff --git a/tests/libtar/Makemodule.am b/tests/libtar/Makemodule.am index bc829fb..b042f74 100644 --- a/tests/libtar/Makemodule.am +++ b/tests/libtar/Makemodule.am @@ -1,160 +1,160 @@ TARDATADIR=$(top_srcdir)/tests/libtar/data test_tar_gnu0_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu0_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu0_LDADD = libtar.a libio.a libcompat.a test_tar_gnu0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu0_CPPFLAGS += -DTESTFILE=format-acceptance/gnu.tar test_tar_gnu1_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu1_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu1_LDADD = libtar.a libio.a libcompat.a test_tar_gnu1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu1_CPPFLAGS += -DTESTFILE=format-acceptance/gnu-g.tar test_tar_gnu2_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu2_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu2_LDADD = libtar.a libio.a libcompat.a test_tar_gnu2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu2_CPPFLAGS += -DTESTFILE=user-group-largenum/gnu.tar test_tar_gnu2_CPPFLAGS += -DTESTUID=0x80000000 -DTESTGID=0x80000000 test_tar_gnu2_CPPFLAGS += -DTESTTS=1542995392 test_tar_gnu3_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu3_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu3_LDADD = libtar.a libio.a libcompat.a test_tar_gnu3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu3_CPPFLAGS += -DTESTFILE=negative-mtime/gnu.tar -DTESTTS=-315622800 test_tar_gnu4_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu4_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu4_LDADD = libtar.a libio.a libcompat.a test_tar_gnu4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu4_CPPFLAGS += -DTESTFILE=long-paths/gnu.tar -DLONG_NAME_TEST test_tar_gnu4_CPPFLAGS += -DTESTTS=1542909670 test_tar_gnu5_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_gnu5_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu5_LDADD = libtar.a libio.a libcompat.a test_tar_gnu5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu5_CPPFLAGS += -DTESTFILE=large-mtime/gnu.tar -DTESTTS=8589934592L test_tar_gnu6_SOURCES = tests/libtar/tar_big_file.c tests/test.h -test_tar_gnu6_LDADD = libtar.a libfstream.a libcompat.a +test_tar_gnu6_LDADD = libtar.a libio.a libcompat.a test_tar_gnu6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu6_CPPFLAGS += -DTESTFILE=file-size/gnu.tar test_tar_pax0_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_pax0_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax0_LDADD = libtar.a libio.a libcompat.a test_tar_pax0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax0_CPPFLAGS += -DTESTFILE=format-acceptance/pax.tar test_tar_pax1_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_pax1_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax1_LDADD = libtar.a libio.a libcompat.a test_tar_pax1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax1_CPPFLAGS += -DTESTFILE=user-group-largenum/pax.tar test_tar_pax1_CPPFLAGS += -DTESTUID=2147483648UL -DTESTGID=2147483648UL test_tar_pax1_CPPFLAGS += -DTESTTS=1542995392 test_tar_pax2_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_pax2_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax2_LDADD = libtar.a libio.a libcompat.a test_tar_pax2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax2_CPPFLAGS += -DTESTFILE=large-mtime/pax.tar -DTESTTS=8589934592L test_tar_pax3_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_pax3_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax3_LDADD = libtar.a libio.a libcompat.a test_tar_pax3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax3_CPPFLAGS += -DTESTFILE=negative-mtime/pax.tar -DTESTTS=-315622800 test_tar_pax4_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_pax4_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax4_LDADD = libtar.a libio.a libcompat.a test_tar_pax4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax4_CPPFLAGS += -DTESTFILE=long-paths/pax.tar test_tar_pax4_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 test_tar_pax5_SOURCES = tests/libtar/tar_big_file.c tests/test.h -test_tar_pax5_LDADD = libtar.a libfstream.a libcompat.a +test_tar_pax5_LDADD = libtar.a libio.a libcompat.a test_tar_pax5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax5_CPPFLAGS += -DTESTFILE=file-size/pax.tar test_tar_ustar0_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar0_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar0_LDADD = libtar.a libio.a libcompat.a test_tar_ustar0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar0_CPPFLAGS += -DTESTFILE=format-acceptance/ustar.tar test_tar_ustar1_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar1_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar1_LDADD = libtar.a libio.a libcompat.a test_tar_ustar1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar1_CPPFLAGS += -DTESTFILE=format-acceptance/ustar-pre-posix.tar test_tar_ustar2_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar2_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar2_LDADD = libtar.a libio.a libcompat.a test_tar_ustar2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar2_CPPFLAGS += -DTESTFILE=format-acceptance/v7.tar test_tar_ustar3_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar3_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar3_LDADD = libtar.a libio.a libcompat.a test_tar_ustar3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar3_CPPFLAGS += -DTESTFILE=user-group-largenum/8-digit.tar test_tar_ustar3_CPPFLAGS += -DTESTUID=8388608 -DTESTGID=8388608 test_tar_ustar3_CPPFLAGS += -DTESTTS=1542995392 test_tar_ustar4_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar4_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar4_LDADD = libtar.a libio.a libcompat.a test_tar_ustar4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar4_CPPFLAGS += -DTESTFILE=large-mtime/12-digit.tar test_tar_ustar4_CPPFLAGS += -DTESTTS=8589934592L test_tar_ustar5_SOURCES = tests/libtar/tar_simple.c tests/test.h -test_tar_ustar5_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar5_LDADD = libtar.a libio.a libcompat.a test_tar_ustar5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar5_CPPFLAGS += -DTESTFILE=long-paths/ustar.tar test_tar_ustar5_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 test_tar_ustar6_SOURCES = tests/libtar/tar_big_file.c tests/test.h -test_tar_ustar6_LDADD = libtar.a libfstream.a libcompat.a +test_tar_ustar6_LDADD = libtar.a libio.a libcompat.a test_tar_ustar6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar6_CPPFLAGS += -DTESTFILE=file-size/12-digit.tar test_tar_target_filled_SOURCES = tests/libtar/tar_target_filled.c tests/test.h -test_tar_target_filled_LDADD = libtar.a libfstream.a libcompat.a +test_tar_target_filled_LDADD = libtar.a libio.a libcompat.a test_tar_target_filled_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu_SOURCES = tests/libtar/tar_sparse_gnu.c tests/test.h -test_tar_sparse_gnu_LDADD = libtar.a libfstream.a libcompat.a +test_tar_sparse_gnu_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu0_SOURCES = tests/libtar/tar_sparse.c tests/test.h -test_tar_sparse_gnu0_LDADD = libtar.a libfstream.a libcompat.a +test_tar_sparse_gnu0_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu0_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-0.tar test_tar_sparse_gnu1_SOURCES = tests/libtar/tar_sparse.c tests/test.h -test_tar_sparse_gnu1_LDADD = libtar.a libfstream.a libcompat.a +test_tar_sparse_gnu1_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu1_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-1.tar test_tar_sparse_gnu2_SOURCES = tests/libtar/tar_sparse.c tests/test.h -test_tar_sparse_gnu2_LDADD = libtar.a libfstream.a libcompat.a +test_tar_sparse_gnu2_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu2_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu1-0.tar test_tar_sparse_gnu3_SOURCES = tests/libtar/tar_sparse.c tests/test.h -test_tar_sparse_gnu3_LDADD = libtar.a libfstream.a libcompat.a +test_tar_sparse_gnu3_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu3_CPPFLAGS += -DTESTFILE=sparse-files/gnu.tar test_tar_xattr_bsd_SOURCES = tests/libtar/tar_xattr.c tests/test.h -test_tar_xattr_bsd_LDADD = libtar.a libfstream.a libcompat.a +test_tar_xattr_bsd_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_bsd_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_bsd_CPPFLAGS += -DTESTFILE=xattr/xattr-libarchive.tar test_tar_xattr_schily_SOURCES = tests/libtar/tar_xattr.c tests/test.h -test_tar_xattr_schily_LDADD = libtar.a libfstream.a libcompat.a +test_tar_xattr_schily_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_schily_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_schily_CPPFLAGS += -DTESTFILE=xattr/xattr-schily.tar test_tar_xattr_schily_bin_SOURCES = tests/libtar/tar_xattr_bin.c tests/test.h -test_tar_xattr_schily_bin_LDADD = libtar.a libfstream.a libcompat.a +test_tar_xattr_schily_bin_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_schily_bin_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_schily_bin_CPPFLAGS += -DTESTFILE=xattr/xattr-schily-binary.tar tar_fuzz_SOURCES = tests/libtar/tar_fuzz.c -tar_fuzz_LDADD = libtar.a libfstream.a libcompat.a +tar_fuzz_LDADD = libtar.a libio.a libcompat.a LIBTAR_TESTS = \ test_tar_ustar0 test_tar_ustar1 test_tar_ustar2 test_tar_ustar3 \ diff --git a/tests/libtar/tar_big_file.c b/tests/libtar/tar_big_file.c index 499805f..6e5af50 100644 --- a/tests/libtar/tar_big_file.c +++ b/tests/libtar/tar_big_file.c @@ -6,6 +6,7 @@ */ #include "config.h" #include "tar.h" +#include "io/file.h" #include "../test.h" int main(int argc, char **argv) diff --git a/tests/libtar/tar_fuzz.c b/tests/libtar/tar_fuzz.c index d5728b5..e7ab2b4 100644 --- a/tests/libtar/tar_fuzz.c +++ b/tests/libtar/tar_fuzz.c @@ -6,6 +6,7 @@ */ #include "config.h" +#include "io/file.h" #include "tar.h" #include diff --git a/tests/libtar/tar_simple.c b/tests/libtar/tar_simple.c index e5f0137..4fc1b8b 100644 --- a/tests/libtar/tar_simple.c +++ b/tests/libtar/tar_simple.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libtar/tar_sparse.c b/tests/libtar/tar_sparse.c index 24f7a57..d868c80 100644 --- a/tests/libtar/tar_sparse.c +++ b/tests/libtar/tar_sparse.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libtar/tar_sparse_gnu.c b/tests/libtar/tar_sparse_gnu.c index 5d12478..c55f175 100644 --- a/tests/libtar/tar_sparse_gnu.c +++ b/tests/libtar/tar_sparse_gnu.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libtar/tar_target_filled.c b/tests/libtar/tar_target_filled.c index 57c6af9..34bf20f 100644 --- a/tests/libtar/tar_target_filled.c +++ b/tests/libtar/tar_target_filled.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libtar/tar_xattr.c b/tests/libtar/tar_xattr.c index 877bfba..7dde243 100644 --- a/tests/libtar/tar_xattr.c +++ b/tests/libtar/tar_xattr.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libtar/tar_xattr_bin.c b/tests/libtar/tar_xattr_bin.c index 51ca0b0..ea2bc28 100644 --- a/tests/libtar/tar_xattr_bin.c +++ b/tests/libtar/tar_xattr_bin.c @@ -5,6 +5,7 @@ * Copyright (C) 2019 David Oberhollenzer */ #include "config.h" +#include "io/file.h" #include "tar.h" #include "../test.h" diff --git a/tests/libutil/Makemodule.am b/tests/libutil/Makemodule.am index 27d6341..557a65c 100644 --- a/tests/libutil/Makemodule.am +++ b/tests/libutil/Makemodule.am @@ -1,5 +1,5 @@ test_str_table_SOURCES = tests/libutil/str_table.c tests/test.h -test_str_table_LDADD = libutil.a libfstream.a libcompat.a +test_str_table_LDADD = libutil.a libio.a libcompat.a test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/libutil test_rbtree_SOURCES = tests/libutil/rbtree.c tests/test.h diff --git a/tests/libutil/str_table.c b/tests/libutil/str_table.c index a69a9c4..509594c 100644 --- a/tests/libutil/str_table.c +++ b/tests/libutil/str_table.c @@ -7,7 +7,7 @@ #include "config.h" #include "util/str_table.h" -#include "fstream.h" +#include "io/file.h" #include "compat.h" #include "../test.h" -- cgit v1.2.3