Merge Makefile rewrite into master

[ccan] / ccan / aga / test / api-adjacency.c

diff --git a/ccan/aga/test/api-adjacency.c b/ccan/aga/test/api-adjacency.c
index 5e9bac22db9c9c4ccc0b0eff445f06d643c12967..3168522401018b751eb5b2daa70792d863af2963 100644 (file)
--- a/ccan/aga/test/api-adjacency.c
+++ b/ccan/aga/test/api-adjacency.c
@@ -61,13 +61,16 @@ int main(void)
        struct grid_graph gg1, gg2;
        struct error_graph eg;
        struct traversal1_graph t1g;
+       struct shortcut1_graph s1g;
+       struct shortcut2_graph s2g;
+       struct negacycle_graph ng;
 
-       plan_tests(2 + 7 + 35 + 30 + 30 + 42 + 9 + 30);
+       plan_tests(2 + 7 + 35 + 30 + 30 + 42 + 9 + 30 + 9 + 9 + 9);
 
        trivial_graph_init(&tg);
        test_adjacency("trivial", &tg.sg, trivial_adjacency);
 
-       parallel_graph_init(&pg, 3);
+       parallel_graph_init(&pg, 3, 0);
        test_adjacency("parallel nlinks 3", &pg.sg,
                       parallel_adjacency_nlinks3);
 
@@ -91,5 +94,14 @@ int main(void)
        traversal1_graph_init(&t1g);
        test_adjacency("traversal1 graph", &t1g.sg, traversal1_adjacency);
 
+       shortcut1_graph_init(&s1g);
+       test_adjacency("shortcut1 graph", &s1g.sg, shortcut1_adjacency);
+
+       shortcut2_graph_init(&s2g);
+       test_adjacency("shortcut2 graph", &s2g.sg, shortcut2_adjacency);
+
+       negacycle_graph_init(&ng);
+       test_adjacency("negacycle graph", &ng.sg, negacycle_adjacency);
+
        return exit_status();
 }