Split stream compression out of libio

Move it to a separate libxfrm library, where it can be independently
tested as well. The bulk of the new code is also mainly test cases
for the compressors.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

4 files changed, 452 insertions, 293 deletions

diff --git a/tests/libio/Makemodule.am b/tests/libio/Makemodule.am
index df2e9d3..3676d1a 100644
--- a/tests/libio/Makemodule.am
+++ b/tests/libio/Makemodule.am
@@ -3,66 +3,9 @@ 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
-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
-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
-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
-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
-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
-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
-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/libxfrm/Makemodule.am b/tests/libxfrm/Makemodule.am
new file mode 100644
index 0000000..706406c
--- /dev/null
+++ b/tests/libxfrm/Makemodule.am
@@ -0,0 +1,55 @@
+LIBXFRM_LIBS = $(ZLIB_LIBS) $(XZ_LIBS) $(BZIP2_LIBS) $(ZSTD_LIBS)
+LIBXFRM_TESTS =
+
+if WITH_GZIP
+test_unpack_gzip_SOURCES = tests/libxfrm/unpack.c
+test_unpack_gzip_LDADD = libxfrm.a $(ZLIB_LIBS)
+test_unpack_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1
+
+test_pack_gzip_SOURCES = tests/libxfrm/pack.c
+test_pack_gzip_LDADD = libxfrm.a $(LIBXFRM_LIBS)
+test_pack_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1
+
+LIBXFRM_TESTS += test_pack_gzip test_unpack_gzip
+endif
+
+if WITH_XZ
+test_unpack_xz_SOURCES = tests/libxfrm/unpack.c
+test_unpack_xz_LDADD = libxfrm.a $(XZ_LIBS)
+test_unpack_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1
+
+test_pack_xz_SOURCES = tests/libxfrm/pack.c
+test_pack_xz_LDADD = libxfrm.a $(LIBXFRM_LIBS)
+test_pack_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1
+
+LIBXFRM_TESTS += test_pack_xz test_unpack_xz
+endif
+
+if WITH_BZIP2
+test_unpack_bzip2_SOURCES = tests/libxfrm/unpack.c
+test_unpack_bzip2_LDADD = libxfrm.a $(BZIP2_LIBS)
+test_unpack_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1
+
+test_pack_bzip2_SOURCES = tests/libxfrm/pack.c
+test_pack_bzip2_LDADD = libxfrm.a $(LIBXFRM_LIBS)
+test_pack_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1
+
+LIBXFRM_TESTS += test_unpack_bzip2 test_pack_bzip2
+endif
+
+if WITH_ZSTD
+if HAVE_ZSTD_STREAM
+test_pack_zstd_SOURCES = tests/libxfrm/unpack.c
+test_pack_zstd_LDADD = libxfrm.a $(ZSTD_LIBS)
+test_pack_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1
+
+test_unpack_zstd_SOURCES = tests/libxfrm/pack.c
+test_unpack_zstd_LDADD = libxfrm.a $(LIBXFRM_LIBS)
+test_unpack_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1
+
+LIBXFRM_TESTS += test_pack_zstd test_unpack_zstd
+endif
+endif
+
+check_PROGRAMS += $(LIBXFRM_TESTS)
+TESTS += $(LIBXFRM_TESTS)
diff --git a/tests/libxfrm/pack.c b/tests/libxfrm/pack.c
new file mode 100644
index 0000000..c297005
--- /dev/null
+++ b/tests/libxfrm/pack.c
@@ -0,0 +1,165 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * compress.c
+ *
+ * Copyright (C) 2022 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "xfrm/compress.h"
+#include "xfrm/stream.h"
+#include "util/test.h"
+
+static const char text[] =
+"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";
+
+static sqfs_u8 buffer_cmp[1024];
+static sqfs_u8 buffer_plain[1024];
+static sqfs_u8 ref_cmp[1024];
+static size_t ref_size;
+
+#if defined(DO_BZIP2)
+#define	mkdecompressor decompressor_stream_bzip2_create
+#define mkcompressor compressor_stream_bzip2_create
+
+static sqfs_u8 magic[3] = "BZh";
+static int comp_id = XFRM_COMPRESSOR_BZIP2;
+static const char *comp_name = "bzip2";
+#elif defined(DO_XZ)
+#define	mkdecompressor decompressor_stream_xz_create
+#define mkcompressor compressor_stream_xz_create
+
+static sqfs_u8 magic[6] = "\xFD" "7zXZ";
+static int comp_id = XFRM_COMPRESSOR_XZ;
+static const char *comp_name = "xz";
+#elif defined(DO_GZIP)
+#define	mkdecompressor decompressor_stream_gzip_create
+#define mkcompressor compressor_stream_gzip_create
+
+static sqfs_u8 magic[3] = "\x1F\x8B\x08";
+static int comp_id = XFRM_COMPRESSOR_GZIP;
+static const char *comp_name = "gzip";
+#elif defined(DO_ZSTD)
+#define	mkdecompressor decompressor_stream_zstd_create
+#define mkcompressor compressor_stream_zstd_create
+
+static sqfs_u8 magic[4] = "\x28\xB5\x2F\xFD";
+static int comp_id = XFRM_COMPRESSOR_ZSTD;
+static const char *comp_name = "zstd";
+#else
+#error build configuration broken
+#endif
+
+int main(int argc, char **argv)
+{
+	sqfs_u32 in_diff = 0, out_diff = 0;
+	xfrm_stream_t *xfrm;
+	const char *str;
+	size_t size;
+	int ret;
+	(void)argc; (void)argv;
+
+	/* generic name/ID API */
+	ret = xfrm_compressor_id_from_name(comp_name);
+	TEST_EQUAL_I(ret, comp_id);
+
+	str = xfrm_compressor_name_from_id(ret);
+	TEST_STR_EQUAL(str, comp_name);
+
+	/* compress the original text */
+	xfrm = mkcompressor(NULL);
+	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
+
+	ret = xfrm->process_data(xfrm, text, sizeof(text),
+				 buffer_cmp, sizeof(buffer_cmp),
+				 &in_diff, &out_diff, XFRM_STREAM_FLUSH_FULL);
+	TEST_EQUAL_I(ret, XFRM_STREAM_END);
+
+	TEST_EQUAL_UI(in_diff, sizeof(text));
+	TEST_ASSERT(out_diff > 0);
+	TEST_ASSERT(out_diff < sizeof(text));
+
+	sqfs_drop(xfrm);
+
+	size = out_diff;
+	in_diff = out_diff = 0;
+
+	memcpy(ref_cmp, buffer_cmp, size);
+	ref_size = size;
+
+	/* check if it has the expected magic number */
+	TEST_ASSERT(size >= sizeof(magic));
+	ret = memcmp(buffer_cmp, magic, sizeof(magic));
+	TEST_EQUAL_I(ret, 0);
+
+	/* check if the auto detection correctly identifies it */
+	ret = xfrm_compressor_id_from_magic(buffer_cmp, size);
+	TEST_EQUAL_I(ret, comp_id);
+
+	ret = xfrm_compressor_id_from_magic(text, sizeof(text));
+	TEST_EQUAL_I(ret, -1);
+
+	/* unpack the compressed text and compare to the original */
+	xfrm = mkdecompressor();
+	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
+
+	ret = xfrm->process_data(xfrm, buffer_cmp, size,
+				 buffer_plain, sizeof(buffer_plain),
+				 &in_diff, &out_diff, 0);
+	TEST_ASSERT(ret == XFRM_STREAM_END || ret == XFRM_STREAM_OK);
+
+	TEST_EQUAL_UI(in_diff, size);
+	TEST_EQUAL_UI(out_diff, sizeof(text));
+	ret = memcmp(buffer_plain, text, out_diff);
+	TEST_EQUAL_I(ret, 0);
+
+	sqfs_drop(xfrm);
+	in_diff = out_diff = 0;
+
+	/* retry packing but create the compressor using the ID */
+	memset(buffer_cmp, 0, sizeof(buffer_cmp));
+	memset(buffer_plain, 0, sizeof(buffer_plain));
+
+	xfrm = compressor_stream_create(comp_id, NULL);
+	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
+
+	ret = xfrm->process_data(xfrm, text, sizeof(text),
+				 buffer_cmp, sizeof(buffer_cmp),
+				 &in_diff, &out_diff, XFRM_STREAM_FLUSH_FULL);
+	TEST_EQUAL_I(ret, XFRM_STREAM_END);
+
+	TEST_EQUAL_UI(in_diff, sizeof(text));
+	TEST_EQUAL_UI(out_diff, ref_size);
+
+	sqfs_drop(xfrm);
+	size = out_diff;
+	in_diff = out_diff = 0;
+
+	/* make sure we got an identical result */
+	ret = memcmp(ref_cmp, buffer_cmp, size);
+	TEST_EQUAL_I(ret, 0);
+
+	/* decompress it using ID */
+	xfrm = decompressor_stream_create(comp_id);
+	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
+
+	ret = xfrm->process_data(xfrm, buffer_cmp, size,
+				 buffer_plain, sizeof(buffer_plain),
+				 &in_diff, &out_diff, 0);
+	TEST_ASSERT(ret == XFRM_STREAM_END || ret == XFRM_STREAM_OK);
+
+	TEST_EQUAL_UI(in_diff, size);
+	TEST_EQUAL_UI(out_diff, sizeof(text));
+	ret = memcmp(buffer_plain, text, out_diff);
+	TEST_EQUAL_I(ret, 0);
+
+	sqfs_drop(xfrm);
+	return EXIT_SUCCESS;
+}
diff --git a/tests/libio/uncompress.c b/tests/libxfrm/unpack.c
index 4ff20b5..ca51f10 100644
--- a/tests/libio/uncompress.c
+++ b/tests/libxfrm/unpack.c
@@ -1,105 +1,15 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /*
- * uncompress.c
+ * unpack.c
  *
- * Copyright (C) 2021 David Oberhollenzer <goliath@infraroot.at>
+ * Copyright (C) 2022 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "io/istream.h"
-#include "io/xfrm.h"
+#include "xfrm/compress.h"
+#include "xfrm/stream.h"
 #include "util/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)
+static const sqfs_u8 blob_in[] = {
+#if defined(DO_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,
@@ -148,71 +58,48 @@ static sqfs_u8 data_in[] = {
 	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,
+#elif defined(DO_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(DO_GZIP)
+	0x1f, 0x8b, 0x08, 0x08, 0xdb, 0xa1, 0x97, 0x63,
 	0x00, 0x03, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74,
 	0x78, 0x74, 0x00, 0x35, 0x90, 0xc1, 0x71, 0x43,
 	0x31, 0x08, 0x44, 0xef, 0xbf, 0x8a, 0x2d, 0x20,
@@ -248,8 +135,8 @@ static sqfs_u8 data_in[] = {
 	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)
+	0x6b, 0x8b, 0x8b, 0x20, 0xbe, 0x01, 0x00, 0x00,
+#elif defined(DO_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,
@@ -286,8 +173,125 @@ static sqfs_u8 data_in[] = {
 	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)
+	0x76,
+#endif
+};
+
+static const sqfs_u8 blob_in_concat[] = {
+#if defined(DO_XZ)
+	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(DO_BZIP2)
+	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(DO_ZSTD)
 	0x28, 0xb5, 0x2f, 0xfd, 0x04, 0x58, 0x75, 0x04,
 	0x00, 0xb2, 0x4c, 0x20, 0x17, 0xa0, 0x25, 0x69,
 	0x03, 0xf0, 0xb2, 0x37, 0xb1, 0x5e, 0xb9, 0x24,
@@ -328,10 +332,31 @@ static sqfs_u8 data_in[] = {
 	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
+	0x3d, 0xd3, 0x35, 0x8f,
+#elif defined(DO_GZIP)
+	0,
 #endif
 };
 
+#if defined(DO_XZ)
+static size_t in_stop = 244;
+static size_t out_stop = 221;
+
+#define mkdecompressor decompressor_stream_xz_create
+#elif defined(DO_BZIP2)
+static size_t in_stop = 186;
+static size_t out_stop = 221;
+
+#define mkdecompressor decompressor_stream_bzip2_create
+#elif defined(DO_ZSTD)
+static size_t in_stop = 319;
+static size_t out_stop = 446;
+
+#define mkdecompressor decompressor_stream_zstd_create
+#elif defined(DO_GZIP)
+#define mkdecompressor decompressor_stream_gzip_create
+#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"
@@ -340,93 +365,64 @@ static const char orig[] =
 "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;
+	sqfs_u32 in_diff = 0, out_diff = 0;
+	xfrm_stream_t *xfrm;
+	char buffer[1024];
 	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));
+	/* normal stream */
+	xfrm = mkdecompressor();
+	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
 
-	name = io_compressor_name_from_id(COMP_ID);
-	TEST_STR_EQUAL(name, COMP_NAME);
+	ret = xfrm->process_data(xfrm, blob_in, sizeof(blob_in),
+				 buffer, sizeof(buffer),
+				 &in_diff, &out_diff, XFRM_STREAM_FLUSH_FULL);
+	TEST_EQUAL_I(ret, XFRM_STREAM_END);
 
-	ret = io_compressor_id_from_name(name);
-	TEST_EQUAL_I(ret, COMP_ID);
+	TEST_EQUAL_UI(in_diff, sizeof(blob_in));
+	TEST_EQUAL_UI(out_diff, sizeof(orig) - 1);
+	ret = memcmp(buffer, orig, out_diff);
+	TEST_EQUAL_I(ret, 0);
 
-	ret = istream_detect_compressor(&memstream, NULL);
-	TEST_EQUAL_I(ret, COMP_ID);
+	sqfs_drop(xfrm);
 
-	/* decoder test */
-	xfrm = istream_compressor_create(&memstream, COMP_ID);
+	/* concatenated streams */
+#if !defined(DO_GZIP)
+	xfrm = mkdecompressor();
 	TEST_NOT_NULL(xfrm);
+	TEST_EQUAL_UI(((sqfs_object_t *)xfrm)->refcount, 1);
 
-	name = istream_get_filename(xfrm);
-	TEST_STR_EQUAL(name, "memstream");
+	in_diff = 0;
+	out_diff = 0;
 
-	ret = istream_read(xfrm, buffer, sizeof(buffer));
-	TEST_ASSERT(ret > 0);
-	TEST_EQUAL_UI((size_t)ret, orig_sz);
+	ret = xfrm->process_data(xfrm, blob_in_concat, sizeof(blob_in_concat),
+				 buffer, sizeof(buffer),
+				 &in_diff, &out_diff, XFRM_STREAM_FLUSH_FULL);
+	TEST_EQUAL_I(ret, XFRM_STREAM_END);
 
-	ret = memcmp(buffer, orig, ret);
+	TEST_EQUAL_UI(in_diff, in_stop);
+	TEST_EQUAL_UI(out_diff, out_stop);
+	ret = memcmp(buffer, orig, out_diff);
 	TEST_EQUAL_I(ret, 0);
 
-	ret = istream_read(xfrm, buffer, sizeof(buffer));
+	ret = xfrm->process_data(xfrm, blob_in_concat + in_diff,
+				 sizeof(blob_in_concat) - in_diff,
+				 buffer + out_diff, sizeof(buffer) - out_diff,
+				 &in_diff, &out_diff, XFRM_STREAM_FLUSH_FULL);
+	TEST_EQUAL_I(ret, XFRM_STREAM_END);
+
+	TEST_EQUAL_UI(in_diff, sizeof(blob_in_concat));
+	TEST_EQUAL_UI(out_diff, sizeof(orig) - 1);
+	ret = memcmp(buffer, orig, out_diff);
 	TEST_EQUAL_I(ret, 0);
 
-	/* cleanup */
 	sqfs_drop(xfrm);
+#else
+	(void)blob_in_concat;
+#endif
 	return EXIT_SUCCESS;
 }