From cd1ec786238202b987a7624e763dadc725a46a67 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 26 Sep 2024 08:27:13 +0200 Subject: Fix prefix path for file globing Reported-by: Sebastian Birunt Suggested-by: Sebastian Birunt Signed-off-by: David Oberhollenzer --- tests/gensquashfs/fstree_from_dir.c | 9 +++++++++ tests/gensquashfs/fstree_glob1.c | 12 ++++++++++++ 2 files changed, 21 insertions(+) (limited to 'tests') diff --git a/tests/gensquashfs/fstree_from_dir.c b/tests/gensquashfs/fstree_from_dir.c index 5e73fa4..39dfd19 100644 --- a/tests/gensquashfs/fstree_from_dir.c +++ b/tests/gensquashfs/fstree_from_dir.c @@ -24,18 +24,21 @@ static void check_hierarchy(tree_node_t *root, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_a0"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dira/file_a0"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_a1"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dira/file_a1"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_a2"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dira/file_a2"); TEST_ASSERT(m->parent == n); m = m->next; @@ -55,18 +58,21 @@ static void check_hierarchy(tree_node_t *root, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_b0"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirb/file_b0"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_b1"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirb/file_b1"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_b2"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirb/file_b2"); TEST_ASSERT(m->parent == n); m = m->next; @@ -86,18 +92,21 @@ static void check_hierarchy(tree_node_t *root, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_c0"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirc/file_c0"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_c1"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirc/file_c1"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "file_c2"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "dirc/file_c2"); TEST_ASSERT(m->parent == n); m = m->next; diff --git a/tests/gensquashfs/fstree_glob1.c b/tests/gensquashfs/fstree_glob1.c index fbcbf91..398104e 100644 --- a/tests/gensquashfs/fstree_glob1.c +++ b/tests/gensquashfs/fstree_glob1.c @@ -41,6 +41,7 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/file-size/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -60,12 +61,14 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu-g.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/format-acceptance/gnu-g.tar"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/format-acceptance/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -85,6 +88,7 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/large-mtime/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -104,6 +108,7 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/long-paths/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -123,6 +128,7 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/negative-mtime/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -142,30 +148,35 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu-small.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/sparse-files/gnu-small.tar"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/sparse-files/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "pax-gnu0-0.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/sparse-files/pax-gnu0-0.tar"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "pax-gnu0-1.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/sparse-files/pax-gnu0-1.tar"); TEST_ASSERT(m->parent == n); m = m->next; TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "pax-gnu1-0.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/sparse-files/pax-gnu1-0.tar"); TEST_ASSERT(m->parent == n); m = m->next; @@ -185,6 +196,7 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) TEST_NOT_NULL(m); TEST_STR_EQUAL(m->name, "gnu.tar"); TEST_ASSERT(S_ISREG(m->mode)); + TEST_STR_EQUAL(m->data.file.input_file, "../libtar/data/user-group-largenum/gnu.tar"); TEST_ASSERT(m->parent == n); m = m->next; -- cgit v1.2.3