X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Ftest%2Fapi-adjacency.c;h=64fa279039eea81ad0641d55d6ac9a74c740de6e;hb=c23a40c7f1ac9fad0146b46988a41f196aae933f;hp=9482bbacb424068d3d87d955bbfaf5afd1f95bff;hpb=13430d4e252edbe0c202237e5a956670da1efe0b;p=ccan

diff --git a/ccan/agar/test/api-adjacency.c b/ccan/agar/test/api-adjacency.c
index 9482bbac..64fa2790 100644
--- a/ccan/agar/test/api-adjacency.c
+++ b/ccan/agar/test/api-adjacency.c
@@ -49,18 +49,14 @@ 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;
-	struct shortcut1_graphr s1gr;
 
-	plan_tests(1 + 5 + 30 + 22 + 21 + 33 + 6 + 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, 0);
 	test_adjacency("parallel nlinks 3", &pgr.gr,
@@ -80,11 +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);
 
-	shortcut1_graphr_init(&s1gr);
-	test_adjacency("shortcut1 graph", &s1gr.gr, shortcut1_adjacencyr);
+	test_adjacency("shortcut1 graph", &shortcut1_graphr.gr,
+		       shortcut1_adjacencyr);
 
+	test_adjacency("shortcut2 graph", &shortcut2_graphr.gr,
+		       shortcut2_adjacencyr);
+	
 	return exit_status();
 }