X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Ftest%2Fapi-adjacency.c;h=64fa279039eea81ad0641d55d6ac9a74c740de6e;hb=8bede7d6e3f363151cb680cfc44b59e6a7d13b23;hp=c17ead55e3ae7631fcabda93a76b2d8573eb44c9;hpb=c2966d1879c825cfaf0e7d6848a5da052ee4a038;p=ccan

diff --git a/ccan/agar/test/api-adjacency.c b/ccan/agar/test/api-adjacency.c
index c17ead55..64fa2790 100644
--- a/ccan/agar/test/api-adjacency.c
+++ b/ccan/agar/test/api-adjacency.c
@@ -49,19 +49,16 @@ static void test_adjacency(const char *name,
 
 int main(void)
 {
-	struct trivial_graphr tgr;
 	struct parallel_graphr pgr;
 	struct full_graphr fgr;
 	struct chain_graphr cgr;
 	struct grid_graphr ggr1, ggr2;
-	struct error_graphr egr;
 
-	plan_tests(1 + 5 + 30 + 22 + 21 + 33 + 6);
+	plan_tests(1 + 5 + 30 + 22 + 21 + 33 + 6 + 6 + 6);
 
-	trivial_graphr_init(&tgr);
-	test_adjacency("trivial", &tgr.gr, trivial_adjacencyr);
+	test_adjacency("trivial", &trivial_graphr.gr, trivial_adjacencyr);
 
-	parallel_graphr_init(&pgr, 3);
+	parallel_graphr_init(&pgr, 3, 0);
 	test_adjacency("parallel nlinks 3", &pgr.gr,
 		       parallel_adjacencyr_nlinks3);
 
@@ -79,8 +76,13 @@ int main(void)
 	test_adjacency("grid 3x3 all", &ggr2.gr,
 		       grid_adjacencyr_3x3_all);
 
-	error_graphr_init(&egr);
-	test_adjacency("error graph", &egr.gr, error_adjacencyr);
+	test_adjacency("error graph", &error_graphr.gr, error_adjacencyr);
 
+	test_adjacency("shortcut1 graph", &shortcut1_graphr.gr,
+		       shortcut1_adjacencyr);
+
+	test_adjacency("shortcut2 graph", &shortcut2_graphr.gr,
+		       shortcut2_adjacencyr);
+	
 	return exit_status();
 }