aboutsummaryrefslogtreecommitdiff
path: root/lib/fstree/test
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fstree/test')
-rw-r--r--lib/fstree/test/fstree_sort.c16
-rw-r--r--lib/fstree/test/gen_inode_numbers.c28
-rw-r--r--lib/fstree/test/mknode_dir.c27
-rw-r--r--lib/fstree/test/mknode_reg.c13
-rw-r--r--lib/fstree/test/mknode_simple.c47
-rw-r--r--lib/fstree/test/mknode_slink.c24
6 files changed, 93 insertions, 62 deletions
diff --git a/lib/fstree/test/fstree_sort.c b/lib/fstree/test/fstree_sort.c
index fc44899..135976d 100644
--- a/lib/fstree/test/fstree_sort.c
+++ b/lib/fstree/test/fstree_sort.c
@@ -28,25 +28,25 @@ int main(int argc, char **argv)
ret = fstree_init(&fs, &fsd);
TEST_EQUAL_I(ret, 0);
- a = fstree_mknode(fs.root, "a", 1, NULL, &sb);
+ a = fstree_add_generic(&fs, "a", &sb, NULL);
TEST_NOT_NULL(a);
TEST_ASSERT(fs.root->data.children == a);
TEST_NULL(a->next);
- b = fstree_mknode(fs.root, "b", 1, NULL, &sb);
+ b = fstree_add_generic(&fs, "b", &sb, NULL);
TEST_NOT_NULL(a);
TEST_ASSERT(fs.root->data.children == a);
TEST_ASSERT(a->next == b);
TEST_NULL(b->next);
- c = fstree_mknode(fs.root, "c", 1, NULL, &sb);
+ c = fstree_add_generic(&fs, "c", &sb, NULL);
TEST_NOT_NULL(c);
TEST_ASSERT(fs.root->data.children == a);
TEST_ASSERT(a->next == b);
TEST_ASSERT(b->next == c);
TEST_NULL(c->next);
- d = fstree_mknode(fs.root, "d", 1, NULL, &sb);
+ d = fstree_add_generic(&fs, "d", &sb, NULL);
TEST_NOT_NULL(d);
TEST_ASSERT(fs.root->data.children == a);
TEST_ASSERT(a->next == b);
@@ -60,25 +60,25 @@ int main(int argc, char **argv)
ret = fstree_init(&fs, &fsd);
TEST_EQUAL_I(ret, 0);
- d = fstree_mknode(fs.root, "d", 1, NULL, &sb);
+ d = fstree_add_generic(&fs, "d", &sb, NULL);
TEST_NOT_NULL(d);
TEST_ASSERT(fs.root->data.children == d);
TEST_NULL(d->next);
- c = fstree_mknode(fs.root, "c", 1, NULL, &sb);
+ c = fstree_add_generic(&fs, "c", &sb, NULL);
TEST_NOT_NULL(c);
TEST_ASSERT(fs.root->data.children == c);
TEST_ASSERT(c->next == d);
TEST_NULL(d->next);
- b = fstree_mknode(fs.root, "b", 1, NULL, &sb);
+ b = fstree_add_generic(&fs, "b", &sb, NULL);
TEST_NOT_NULL(b);
TEST_ASSERT(fs.root->data.children == b);
TEST_ASSERT(b->next == c);
TEST_ASSERT(c->next == d);
TEST_NULL(d->next);
- a = fstree_mknode(fs.root, "a", 1, NULL, &sb);
+ a = fstree_add_generic(&fs, "a", &sb, NULL);
TEST_NOT_NULL(a);
TEST_ASSERT(fs.root->data.children == a);
TEST_ASSERT(a->next == b);
diff --git a/lib/fstree/test/gen_inode_numbers.c b/lib/fstree/test/gen_inode_numbers.c
index b65f64b..9e046a8 100644
--- a/lib/fstree/test/gen_inode_numbers.c
+++ b/lib/fstree/test/gen_inode_numbers.c
@@ -10,14 +10,14 @@
#include "common.h"
#include "util/test.h"
-static tree_node_t *gen_node(tree_node_t *parent, const char *name)
+static tree_node_t *gen_node(fstree_t *fs, const char *path)
{
struct stat sb;
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFDIR | 0755;
- return fstree_mknode(parent, name, strlen(name), NULL, &sb);
+ return fstree_add_generic(fs, path, &sb, NULL);
}
static void check_children_before_root(tree_node_t *root)
@@ -63,24 +63,24 @@ int main(int argc, char **argv)
// tree with 2 levels under root, fan out 3
TEST_ASSERT(fstree_init(&fs, &fsd) == 0);
- a = gen_node(fs.root, "a");
- b = gen_node(fs.root, "b");
- c = gen_node(fs.root, "c");
+ a = gen_node(&fs, "a");
+ b = gen_node(&fs, "b");
+ c = gen_node(&fs, "c");
TEST_NOT_NULL(a);
TEST_NOT_NULL(b);
TEST_NOT_NULL(c);
- TEST_NOT_NULL(gen_node(a, "a_a"));
- TEST_NOT_NULL(gen_node(a, "a_b"));
- TEST_NOT_NULL(gen_node(a, "a_c"));
+ TEST_NOT_NULL(gen_node(&fs, "a/a_a"));
+ TEST_NOT_NULL(gen_node(&fs, "a/a_b"));
+ TEST_NOT_NULL(gen_node(&fs, "a/a_c"));
- TEST_NOT_NULL(gen_node(b, "b_a"));
- TEST_NOT_NULL(gen_node(b, "b_b"));
- TEST_NOT_NULL(gen_node(b, "b_c"));
+ TEST_NOT_NULL(gen_node(&fs, "b/b_a"));
+ TEST_NOT_NULL(gen_node(&fs, "b/b_b"));
+ TEST_NOT_NULL(gen_node(&fs, "b/b_c"));
- TEST_NOT_NULL(gen_node(c, "c_a"));
- TEST_NOT_NULL(gen_node(c, "c_b"));
- TEST_NOT_NULL(gen_node(c, "c_c"));
+ TEST_NOT_NULL(gen_node(&fs, "c/c_a"));
+ TEST_NOT_NULL(gen_node(&fs, "c/c_b"));
+ TEST_NOT_NULL(gen_node(&fs, "c/c_c"));
fstree_post_process(&fs);
TEST_EQUAL_UI(fs.unique_inode_count, 13);
diff --git a/lib/fstree/test/mknode_dir.c b/lib/fstree/test/mknode_dir.c
index a5f6d9a..c2812ac 100644
--- a/lib/fstree/test/mknode_dir.c
+++ b/lib/fstree/test/mknode_dir.c
@@ -11,12 +11,17 @@
int main(int argc, char **argv)
{
+ fstree_defaults_t defaults;
tree_node_t *root, *a, *b;
struct stat sb;
fstree_t fs;
+ int ret;
(void)argc; (void)argv;
- memset(&fs, 0, sizeof(fs));
+ memset(&defaults, 0, sizeof(defaults));
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFDIR | 0654;
sb.st_uid = 123;
@@ -24,7 +29,9 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 4096;
- root = fstree_mknode(NULL, "rootdir", 7, NULL, &sb);
+ root = fstree_add_generic(&fs, "rootdir", &sb, NULL);
+ TEST_NOT_NULL(root);
+ TEST_ASSERT(root->parent == fs.root);
TEST_EQUAL_UI(root->uid, sb.st_uid);
TEST_EQUAL_UI(root->gid, sb.st_gid);
TEST_EQUAL_UI(root->mode, sb.st_mode);
@@ -32,19 +39,20 @@ int main(int argc, char **argv)
TEST_ASSERT(root->name >= (char *)root->payload);
TEST_STR_EQUAL(root->name, "rootdir");
TEST_NULL(root->data.children);
- TEST_NULL(root->parent);
TEST_NULL(root->next);
- a = fstree_mknode(root, "adir", 4, NULL, &sb);
+ a = fstree_add_generic(&fs, "rootdir/adir", &sb, NULL);
+ TEST_NOT_NULL(a);
TEST_ASSERT(a->parent == root);
TEST_NULL(a->next);
TEST_EQUAL_UI(a->link_count, 2);
TEST_EQUAL_UI(root->link_count, 3);
TEST_ASSERT(root->data.children == a);
- TEST_NULL(root->parent);
+ TEST_ASSERT(root->parent == fs.root);
TEST_NULL(root->next);
- b = fstree_mknode(root, "bdir", 4, NULL, &sb);
+ b = fstree_add_generic(&fs, "rootdir/bdir", &sb, NULL);
+ TEST_NOT_NULL(b);
TEST_ASSERT(a->parent == root);
TEST_ASSERT(b->parent == root);
TEST_EQUAL_UI(b->link_count, 2);
@@ -52,12 +60,9 @@ int main(int argc, char **argv)
TEST_ASSERT(a->next == b);
TEST_EQUAL_UI(root->link_count, 4);
TEST_NULL(b->next);
- TEST_NULL(root->parent);
+ TEST_ASSERT(root->parent == fs.root);
TEST_NULL(root->next);
- free(root);
- free(a);
- free(b);
-
+ fstree_cleanup(&fs);
return EXIT_SUCCESS;
}
diff --git a/lib/fstree/test/mknode_reg.c b/lib/fstree/test/mknode_reg.c
index 368720f..3dc6eb3 100644
--- a/lib/fstree/test/mknode_reg.c
+++ b/lib/fstree/test/mknode_reg.c
@@ -11,12 +11,16 @@
int main(int argc, char **argv)
{
+ fstree_defaults_t defaults;
tree_node_t *node;
struct stat sb;
fstree_t fs;
+ int ret;
(void)argc; (void)argv;
- memset(&fs, 0, sizeof(fs));
+ memset(&defaults, 0, sizeof(defaults));
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFREG | 0654;
@@ -25,18 +29,19 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 4096;
- node = fstree_mknode(NULL, "filename", 8, "input", &sb);
+ node = fstree_add_generic(&fs, "filename", &sb, "input");
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_EQUAL_UI(node->uid, sb.st_uid);
TEST_EQUAL_UI(node->gid, sb.st_gid);
TEST_EQUAL_UI(node->mode, sb.st_mode);
- TEST_NULL(node->parent);
TEST_EQUAL_UI(node->link_count, 1);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_ASSERT(node->data.file.input_file >= (char *)node->payload);
TEST_ASSERT(node->data.file.input_file >= node->name + 8);
TEST_STR_EQUAL(node->name, "filename");
TEST_STR_EQUAL(node->data.file.input_file, "input");
- free(node);
+ fstree_cleanup(&fs);
return EXIT_SUCCESS;
}
diff --git a/lib/fstree/test/mknode_simple.c b/lib/fstree/test/mknode_simple.c
index c7efb49..a96ee42 100644
--- a/lib/fstree/test/mknode_simple.c
+++ b/lib/fstree/test/mknode_simple.c
@@ -11,12 +11,17 @@
int main(int argc, char **argv)
{
+ fstree_defaults_t defaults;
tree_node_t *node;
struct stat sb;
fstree_t fs;
+ int ret;
(void)argc; (void)argv;
- memset(&fs, 0, sizeof(fs));
+ memset(&defaults, 0, sizeof(defaults));
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFSOCK | 0654;
sb.st_uid = 123;
@@ -24,19 +29,22 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 1337;
- node = fstree_mknode(NULL, "sockfile", 8, NULL, &sb);
+ node = fstree_add_generic(&fs, "/sockfile", &sb, "target");
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_STR_EQUAL(node->name, "sockfile");
TEST_EQUAL_UI(node->uid, sb.st_uid);
TEST_EQUAL_UI(node->gid, sb.st_gid);
TEST_EQUAL_UI(node->mode, sb.st_mode);
TEST_EQUAL_UI(node->link_count, 1);
- TEST_NULL(node->parent);
TEST_NULL(node->data.target);
TEST_EQUAL_UI(node->data.devno, 0);
- free(node);
- memset(&fs, 0, sizeof(fs));
+ fstree_cleanup(&fs);
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFIFO | 0654;
sb.st_uid = 123;
@@ -44,19 +52,22 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 1337;
- node = fstree_mknode(NULL, "fifo", 4, NULL, &sb);
+ node = fstree_add_generic(&fs, "/fifo", &sb, "target");
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_STR_EQUAL(node->name, "fifo");
TEST_EQUAL_UI(node->uid, sb.st_uid);
TEST_EQUAL_UI(node->gid, sb.st_gid);
TEST_EQUAL_UI(node->mode, sb.st_mode);
TEST_EQUAL_UI(node->link_count, 1);
- TEST_NULL(node->parent);
TEST_NULL(node->data.target);
TEST_EQUAL_UI(node->data.devno, 0);
- free(node);
- memset(&fs, 0, sizeof(fs));
+ fstree_cleanup(&fs);
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFBLK | 0654;
sb.st_uid = 123;
@@ -64,7 +75,9 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 1337;
- node = fstree_mknode(NULL, "blkdev", 6, NULL, &sb);
+ node = fstree_add_generic(&fs, "/blkdev", &sb, NULL);
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_STR_EQUAL(node->name, "blkdev");
TEST_EQUAL_UI(node->uid, sb.st_uid);
@@ -72,10 +85,11 @@ int main(int argc, char **argv)
TEST_EQUAL_UI(node->mode, sb.st_mode);
TEST_EQUAL_UI(node->link_count, 1);
TEST_EQUAL_UI(node->data.devno, sb.st_rdev);
- TEST_NULL(node->parent);
- free(node);
- memset(&fs, 0, sizeof(fs));
+ fstree_cleanup(&fs);
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFCHR | 0654;
sb.st_uid = 123;
@@ -83,7 +97,9 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 1337;
- node = fstree_mknode(NULL, "chardev", 7, NULL, &sb);
+ node = fstree_add_generic(&fs, "/chardev", &sb, NULL);
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_STR_EQUAL(node->name, "chardev");
TEST_EQUAL_UI(node->uid, sb.st_uid);
@@ -91,8 +107,7 @@ int main(int argc, char **argv)
TEST_EQUAL_UI(node->mode, sb.st_mode);
TEST_EQUAL_UI(node->link_count, 1);
TEST_EQUAL_UI(node->data.devno, sb.st_rdev);
- TEST_NULL(node->parent);
- free(node);
+ fstree_cleanup(&fs);
return EXIT_SUCCESS;
}
diff --git a/lib/fstree/test/mknode_slink.c b/lib/fstree/test/mknode_slink.c
index c50a0ba..d741746 100644
--- a/lib/fstree/test/mknode_slink.c
+++ b/lib/fstree/test/mknode_slink.c
@@ -11,12 +11,17 @@
int main(int argc, char **argv)
{
+ fstree_defaults_t defaults;
tree_node_t *node;
struct stat sb;
fstree_t fs;
+ int ret;
(void)argc; (void)argv;
- memset(&fs, 0, sizeof(fs));
+ memset(&defaults, 0, sizeof(defaults));
+ ret = fstree_init(&fs, &defaults);
+ TEST_EQUAL_I(ret, 0);
+
memset(&sb, 0, sizeof(sb));
sb.st_mode = S_IFLNK | 0654;
sb.st_uid = 123;
@@ -24,31 +29,32 @@ int main(int argc, char **argv)
sb.st_rdev = 789;
sb.st_size = 1337;
- node = fstree_mknode(NULL, "symlink", 7, "target", &sb);
+ node = fstree_add_generic(&fs, "/symlink", &sb, "target");
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_EQUAL_UI(node->uid, sb.st_uid);
TEST_EQUAL_UI(node->gid, sb.st_gid);
TEST_EQUAL_UI(node->mode, S_IFLNK | 0777);
TEST_EQUAL_UI(node->link_count, 1);
- TEST_NULL(node->parent);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_ASSERT(node->data.target >= (char *)node->payload);
TEST_ASSERT(node->data.target >= node->name + 8);
TEST_STR_EQUAL(node->name, "symlink");
TEST_STR_EQUAL(node->data.target, "target");
- free(node);
- node = fstree_mknode(NULL, "symlink", 7, "", &sb);
+ node = fstree_add_generic(&fs, "/foo", &sb, "");
+ TEST_NOT_NULL(node);
+ TEST_ASSERT(node->parent == fs.root);
TEST_EQUAL_UI(node->uid, sb.st_uid);
TEST_EQUAL_UI(node->gid, sb.st_gid);
TEST_EQUAL_UI(node->mode, S_IFLNK | 0777);
TEST_EQUAL_UI(node->link_count, 1);
- TEST_NULL(node->parent);
TEST_ASSERT((char *)node->name >= (char *)node->payload);
TEST_ASSERT(node->data.target >= (char *)node->payload);
- TEST_ASSERT(node->data.target >= node->name + 8);
- TEST_STR_EQUAL(node->name, "symlink");
+ TEST_ASSERT(node->data.target >= node->name + 3);
+ TEST_STR_EQUAL(node->name, "foo");
TEST_STR_EQUAL(node->data.target, "");
- free(node);
+ fstree_cleanup(&fs);
return EXIT_SUCCESS;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 21:45:53 +0000