list: list_del_from()

[ccan] / ccan / list / test / run.c

diff --git a/ccan/list/test/run.c b/ccan/list/test/run.c
index ac318e1a7fe484c75b072feeb7c5ac96bfca297c..13a1da4198134d88cbeb56020c1ee9acd7cce24a 100644 (file)
--- a/ccan/list/test/run.c
+++ b/ccan/list/test/run.c
@@ -1,6 +1,6 @@
-#include "list/list.h"
-#include "tap/tap.h"
-#include "list/list.c"
+#include <ccan/list/list.h>
+#include <ccan/tap/tap.h>
+#include <ccan/list/list.c>
 
 struct parent {
        const char *name;
@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
        struct child c1, c2, c3, *c, *n;
        unsigned int i;
 
-       plan_tests(44);
+       plan_tests(47);
        /* Test LIST_HEAD, list_empty and check_list */
        ok1(list_empty(&static_list));
        ok1(list_check(&static_list, NULL));
@@ -71,6 +71,11 @@ int main(int argc, char *argv[])
        /* Test list_check */
        ok1(list_check(&parent.children, NULL));
 
+       /* Test list_check_node */
+       ok1(list_check_node(&c1.list, NULL));
+       ok1(list_check_node(&c2.list, NULL));
+       ok1(list_check_node(&c3.list, NULL));
+
        /* Test list_top */
        ok1(list_top(&parent.children, struct child, list) == &c1);
 
@@ -96,21 +101,23 @@ int main(int argc, char *argv[])
        }
        ok1(i == 3);
 
-       /* Test list_for_each_safe and list_del. */
+       /* Test list_for_each_safe, list_del and list_del_from. */
        i = 0;
        list_for_each_safe(&parent.children, c, n, list) {
                switch (i++) {
                case 0:
-                       ok1(c == &c1);
+                       ok1(c == &c1);  
+                       list_del(&c->list);
                        break;
                case 1:
                        ok1(c == &c2);
+                       list_del_from(&parent.children, &c->list);
                        break;
                case 2:
                        ok1(c == &c3);
+                       list_del_from(&parent.children, &c->list);
                        break;
                }
-               list_del(&c->list);
                ok1(list_check(&parent.children, NULL));
                if (i > 2)
                        break;