From 168ef9be32ad754d7bcb38ed70787237fc12630d Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 22 Nov 2022 14:45:32 +0100 Subject: Move gensquashfs specific code from libfstree to gensquashfs The "from dir" and from "from file" code, as well as the "sort file" code is specific to gensquashfs, so move them there and the test cases as well. The medium term idea is to reduce libfstree to a stub, merge it into the generic writer and ultimately hoist that into libsquashfs. Signed-off-by: David Oberhollenzer --- tests/gensquashfs/Makemodule.am | 48 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) (limited to 'tests/gensquashfs/Makemodule.am') diff --git a/tests/gensquashfs/Makemodule.am b/tests/gensquashfs/Makemodule.am index a20e6ef..c1ab164 100644 --- a/tests/gensquashfs/Makemodule.am +++ b/tests/gensquashfs/Makemodule.am @@ -8,13 +8,55 @@ test_filemap_xattr_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/xattr1.txt test_filemap_xattr_LDADD = libsquashfs.la libfstree.a libutil.a test_filemap_xattr_LDADD += libio.a libcompat.a +test_fstree_from_file_SOURCES = tests/gensquashfs/fstree_from_file.c \ + bin/gensquashfs/fstree_from_file.c \ + bin/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/mkfs.h +test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs +test_fstree_from_file_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/fstree1.txt +test_fstree_from_file_LDADD = libfstree.a libio.a libutil.a libcompat.a + +test_fstree_glob1_SOURCES = tests/gensquashfs/fstree_glob1.c \ + bin/gensquashfs/fstree_from_file.c \ + bin/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/mkfs.h +test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs +test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR) +test_fstree_glob1_LDADD = libfstree.a libio.a libutil.a libcompat.a + +test_fstree_from_dir_SOURCES = tests/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/mkfs.h +test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs +test_fstree_from_dir_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/libtar/data +test_fstree_from_dir_LDADD = libfstree.a libutil.a libcompat.a + +test_sort_file_SOURCES = tests/gensquashfs/sort_file.c \ + bin/gensquashfs/fstree_from_file.c \ + bin/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/sort_by_file.c \ + bin/gensquashfs/mkfs.h +test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs +test_sort_file_LDADD = libfstree.a libio.a libutil.a libcompat.a + +fstree_fuzz_SOURCES = tests/gensquashfs/fstree_fuzz.c \ + bin/gensquashfs/fstree_from_file.c \ + bin/gensquashfs/fstree_from_dir.c \ + bin/gensquashfs/mkfs.h +fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs +fstree_fuzz_LDADD = libfstree.a libio.a libutil.a libcompat.a + GENSQUASHFS_TESTS = \ - test_filemap_xattr + test_filemap_xattr test_fstree_from_file test_fstree_from_dir \ + test_fstree_glob1 test_sort_file if BUILD_TOOLS +noinst_PROGRAMS += fstree_fuzz + check_PROGRAMS += $(GENSQUASHFS_TESTS) TESTS += $(GENSQUASHFS_TESTS) endif -EXTRA_DIST += $(GENDATADIR)/xattr1.txt - +EXTRA_DIST += $(GENDATADIR)/xattr1.txt $(GENDATADIR)/fstree1.txt +EXTRA_DIST += $(GENDATADIR)/fstree_glob1.txt $(GENDATADIR)/fstree_glob2.txt +EXTRA_DIST += $(GENDATADIR)/fstree_glob3.txt -- cgit v1.2.3