tal: rename tal_dup to tal_dup_arr, make tal_dup simpler.

[ccan] / tools / ccanlint / tests / depends_accurate.c

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index d7082fac296c68730383542dce0a82085aee03a3..08760333eafcb6c0d757fc6f5c2e234c0137633a 100644 (file)
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -53,10 +53,9 @@ static bool check_dep_includes(struct manifest *m,
                if (has_dep(m, deps, used, mod))
                        continue;
 
-               /* FIXME: we can't be sure about
-                * conditional includes, so don't
-                * complain. */
-               if (!li[i].cond) {
+               /* FIXME: we can't be sure about conditional includes,
+                * so don't complain (handle common case of idempotent wrap) */
+               if (!li[i].cond || li[i].cond == f->idempotent_cond) {
                        score_file_error(score, f, i+1,
                                         "%s not listed in _info", mod);
                        ok = false;
@@ -105,7 +104,7 @@ static void check_depends_accurate(struct manifest *m,
        }
 
        /* Now remove NUL and append test dependencies to deps. */
-       deps = tal_dup(m, char *, take(deps), core_deps, test_deps + 2);
+       deps = tal_dup_arr(m, char *, take(deps), core_deps, test_deps + 2);
        memcpy(deps + core_deps, tdeps, sizeof(tdeps[0]) * test_deps);
        /* ccan/tap is given a free pass. */
        deps[core_deps + test_deps] = (char *)"ccan/tap";
@@ -138,7 +137,7 @@ struct ccanlint depends_accurate = {
        .key = "depends_accurate",
        .name = "Module's CCAN dependencies are the only CCAN files #included",
        .check = check_depends_accurate,
-       .needs = "depends_exist test_depends_exist"
+       .needs = "depends_exist test_depends_exist headers_idempotent"
 };
 
 REGISTER_TEST(depends_accurate);