From 9940efe053263478c5f29367b11d6f7ed1276aa4 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 2 Apr 2023 17:22:24 +0200 Subject: Move fstree CLI code to libcommon Signed-off-by: David Oberhollenzer --- bin/gensquashfs/test/fstree_from_dir.c | 11 +++++++---- bin/gensquashfs/test/fstree_from_file.c | 4 +++- bin/gensquashfs/test/fstree_glob1.c | 9 ++++++--- bin/gensquashfs/test/sort_file.c | 4 +++- 4 files changed, 19 insertions(+), 9 deletions(-) (limited to 'bin/gensquashfs/test') diff --git a/bin/gensquashfs/test/fstree_from_dir.c b/bin/gensquashfs/test/fstree_from_dir.c index 5e73fa4..d64934e 100644 --- a/bin/gensquashfs/test/fstree_from_dir.c +++ b/bin/gensquashfs/test/fstree_from_dir.c @@ -112,13 +112,16 @@ static void check_hierarchy(tree_node_t *root, bool recursive) int main(int argc, char **argv) { + fstree_defaults_t fsd; struct stat sb; tree_node_t *n; fstree_t fs; (void)argc; (void)argv; + TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0); + /* recursively scan into root */ - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); TEST_ASSERT(fstree_from_dir(&fs, fs.root, TEST_PATH, NULL, NULL, 0) == 0); @@ -127,7 +130,7 @@ int main(int argc, char **argv) fstree_cleanup(&fs); /* non-recursively scan into root */ - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); TEST_ASSERT(fstree_from_dir(&fs, fs.root, TEST_PATH, NULL, NULL, DIR_SCAN_NO_RECURSION) == 0); @@ -139,7 +142,7 @@ int main(int argc, char **argv) memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFDIR | 0755; - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); n = fstree_mknode(fs.root, "foodir", 6, NULL, &sb); TEST_NOT_NULL(n); @@ -158,7 +161,7 @@ int main(int argc, char **argv) memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFDIR | 0755; - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); n = fstree_mknode(fs.root, "foodir", 6, NULL, &sb); TEST_NOT_NULL(n); diff --git a/bin/gensquashfs/test/fstree_from_file.c b/bin/gensquashfs/test/fstree_from_file.c index 2a9ba1e..e526f2d 100644 --- a/bin/gensquashfs/test/fstree_from_file.c +++ b/bin/gensquashfs/test/fstree_from_file.c @@ -11,11 +11,13 @@ int main(int argc, char **argv) { + fstree_defaults_t fsd; tree_node_t *n; fstree_t fs; (void)argc; (void)argv; - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); TEST_ASSERT(fstree_from_file(&fs, TEST_PATH, NULL) == 0); fstree_post_process(&fs); diff --git a/bin/gensquashfs/test/fstree_glob1.c b/bin/gensquashfs/test/fstree_glob1.c index 2d3cb80..dbe0e50 100644 --- a/bin/gensquashfs/test/fstree_glob1.c +++ b/bin/gensquashfs/test/fstree_glob1.c @@ -220,12 +220,15 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) int main(int argc, char **argv) { + fstree_defaults_t fsd; fstree_t fs; int ret; (void)argc; (void)argv; + TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0); + /* first test case, directory tree only */ - ret = fstree_init(&fs, NULL); + ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob1.txt", TEST_PATH); @@ -236,7 +239,7 @@ int main(int argc, char **argv) fstree_cleanup(&fs); /* first test case, directory tree plus fnmatch()ed files */ - ret = fstree_init(&fs, NULL); + ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob2.txt", TEST_PATH); @@ -247,7 +250,7 @@ int main(int argc, char **argv) fstree_cleanup(&fs); /* third test case, same as second, but entries directly at the root */ - ret = fstree_init(&fs, NULL); + ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob3.txt", TEST_PATH); diff --git a/bin/gensquashfs/test/sort_file.c b/bin/gensquashfs/test/sort_file.c index 6c6cce6..4b5caf8 100644 --- a/bin/gensquashfs/test/sort_file.c +++ b/bin/gensquashfs/test/sort_file.c @@ -150,6 +150,7 @@ static istream_t memstream = { int main(int argc, char **argv) { + fstree_defaults_t fsd; file_info_t *fi; fstree_t fs; size_t i; @@ -160,7 +161,8 @@ int main(int argc, char **argv) memstream.buffer_offset = 0; memstream.eof = false; - TEST_ASSERT(fstree_init(&fs, NULL) == 0); + TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0); + TEST_ASSERT(fstree_init(&fs, &fsd) == 0); TEST_ASSERT(fstree_from_file_stream(&fs, &memstream, NULL) == 0); fstree_post_process(&fs); -- cgit v1.2.3