X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fidtree%2Ftest%2Frun.c;h=a3b4fb63a877c1703d4628b612ed0b5501da832b;hp=99ea2daa1d6da512c582c9bf8389ef8b8135b526;hb=3e44cbb718d3b315fea131106f6ccc6feb11ccc0;hpb=59208d61ceac29b28bd2a15cc0f3ebad524d9b6a diff --git a/ccan/idtree/test/run.c b/ccan/idtree/test/run.c index 99ea2daa..a3b4fb63 100644 --- a/ccan/idtree/test/run.c +++ b/ccan/idtree/test/run.c @@ -4,6 +4,16 @@ #define ALLOC_MAX (2 * IDTREE_SIZE) +static bool check_tal_parent(const tal_t *parent, const tal_t *ctx) +{ + while (ctx) { + if (ctx == parent) + return true; + ctx = tal_parent(ctx); + } + return false; +} + int main(int argc, char *argv[]) { unsigned int i; @@ -12,9 +22,9 @@ int main(int argc, char *argv[]) void *ctx; plan_tests(ALLOC_MAX * 5 + 2); - ctx = talloc_named_const(NULL, 1, "test root"); + ctx = tal(NULL, char); idtree = idtree_new(ctx); - ok1(talloc_find_parent_byname(idtree, "test root") == ctx); + ok1(check_tal_parent(ctx, idtree)); for (i = 0; i < ALLOC_MAX; i++) { int id = idtree_add(idtree, &allocated[i], ALLOC_MAX-1); @@ -42,6 +52,6 @@ int main(int argc, char *argv[]) for (i = 0; i < ALLOC_MAX; i++) { ok1(idtree_lookup(idtree, i) == &allocated[i]); } - talloc_free(ctx); + tal_free(ctx); exit(exit_status()); }