diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-04-28 19:36:56 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-04-29 00:26:32 +0200 |
| commit | 2285036e10863aba48dc6eed3c1a791118d11956 (patch) | |
| tree | d94808261eb23df4c25db3c6de6dd45df2e692c7 /bin/gensquashfs/Makemodule.am | |
| parent | 46b01473eee7301cb7b49533af16abe0ee15c286 (diff) | |
gensquashfs: Dismantle the scan_dir wrapper
Create the directory iterator externally and pass it to fstree_from_dir.
The unit test is also removed, because the heavy lifting is now done
outside the function.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs/Makemodule.am')
| -rw-r--r-- | bin/gensquashfs/Makemodule.am | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am index ff426ae..fd39aaf 100644 --- a/bin/gensquashfs/Makemodule.am +++ b/bin/gensquashfs/Makemodule.am @@ -46,14 +46,6 @@ test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR) test_fstree_glob1_LDADD = libcommon.a libfstree.a libio.a libutil.a libcompat.a -test_fstree_from_dir_SOURCES = bin/gensquashfs/test/fstree_from_dir.c \ - bin/gensquashfs/src/fstree_from_dir.c \ - bin/gensquashfs/src/mkfs.h -test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS) -test_fstree_from_dir_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src -test_fstree_from_dir_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/testdir -test_fstree_from_dir_LDADD = libcommon.a libfstree.a libutil.a libcompat.a - test_sort_file_SOURCES = bin/gensquashfs/test/sort_file.c \ bin/gensquashfs/src/fstree_from_file.c \ bin/gensquashfs/src/fstree_from_dir.c \ @@ -70,7 +62,7 @@ fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src fstree_fuzz_LDADD = libcommon.a libfstree.a libio.a libutil.a libcompat.a GENSQUASHFS_TESTS = \ - test_filemap_xattr test_fstree_from_file test_fstree_from_dir \ + test_filemap_xattr test_fstree_from_file \ test_fstree_glob1 test_sort_file noinst_PROGRAMS += fstree_fuzz @@ -81,4 +73,3 @@ TESTS += $(GENSQUASHFS_TESTS) EXTRA_DIST += $(GENDATADIR)/xattr1.txt $(GENDATADIR)/fstree1.txt EXTRA_DIST += $(GENDATADIR)/fstree_glob1.txt $(GENDATADIR)/fstree_glob2.txt EXTRA_DIST += $(GENDATADIR)/fstree_glob3.txt -EXTRA_DIST += $(GENDATADIR)/testdir |