ccanlint: --deps-fail-ignore.

Useful for bulk testing modules, where some might not have required
external (non-CCAN) dependencies.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 7747a4976e7cd1ea748191ff5246480806cb027b..89e0b5c61237751d8fbd6a85c2987694d3a1d02e 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -43,6 +43,8 @@ int verbose = 0;
 static struct ccanlint_map tests;
 bool safe_mode = false;
 bool keep_results = false;
+bool non_ccan_deps = false;
+bool build_failed = false;
 static bool targeting = false;
 static unsigned int timeout;
 
@@ -556,10 +558,12 @@ static char *opt_set_target(const char *arg, struct dgraph_node *all)
 
 static bool run_tests(struct dgraph_node *all,
                      bool summary,
+                     bool deps_fail_ignore,
                      struct manifest *m,
                      const char *prefix)
 {
        struct run_info run;
+       const char *comment = "";
 
        run.quiet = summary;
        run.m = m;
@@ -567,9 +571,18 @@ static bool run_tests(struct dgraph_node *all,
        run.score = run.total = 0;
        run.pass = true;
 
+       non_ccan_deps = build_failed = false;
+
        dgraph_traverse_to(all, run_test, &run);
 
-       printf("%sTotal score: %u/%u\n", prefix, run.score, run.total);
+       /* We can completely fail if we're missing external stuff: ignore */
+       if (deps_fail_ignore && non_ccan_deps && build_failed) {
+               comment = " (missing non-ccan dependencies?)";
+               run.pass = true;
+       }
+       printf("%sTotal score: %u/%u%s\n",
+              prefix, run.score, run.total, comment);
+
        return run.pass;
 }
 
@@ -583,7 +596,8 @@ static bool add_to_all(const char *member, struct ccanlint *c,
 }
 
 static bool test_module(struct dgraph_node *all,
-                       const char *dir, const char *prefix, bool summary)
+                       const char *dir, const char *prefix, bool summary,
+                       bool deps_fail_ignore)
 {
        struct manifest *m = get_manifest(autofree(), dir);
        char *testlink = path_join(NULL, temp_dir(), "test");
@@ -594,12 +608,12 @@ static bool test_module(struct dgraph_node *all,
        if (symlink(path_join(m, dir, "test"), testlink) != 0)
                err(1, "Creating test symlink in %s", temp_dir());
 
-       return run_tests(all, summary, m, prefix);
+       return run_tests(all, summary, deps_fail_ignore, m, prefix);
 }
 
 int main(int argc, char *argv[])
 {
-       bool summary = false, pass = true;
+       bool summary = false, pass = true, deps_fail_ignore = false;
        unsigned int i;
        const char *prefix = "";
        char *cwd = path_cwd(NULL), *dir;
@@ -633,6 +647,9 @@ int main(int argc, char *argv[])
                         NULL, &override_compiler, "set the compiler");
        opt_register_arg("--cflags <flags>", opt_set_const_charp,
                         NULL, &override_cflags, "set the compiler flags");
+       opt_register_noarg("--deps-fail-ignore", opt_set_bool,
+                          &deps_fail_ignore,
+                          "don't fail if external dependencies are missing");
        opt_register_noarg("-?|-h|--help", opt_usage_and_exit,
                           "\nA program for checking and guiding development"
                           " of CCAN modules.",
@@ -676,7 +693,8 @@ int main(int argc, char *argv[])
                compiler = override_compiler;
 
        if (argc == 1)
-               pass = test_module(&top.node, cwd, "", summary);
+               pass = test_module(&top.node, cwd, "",
+                                  summary, deps_fail_ignore);
        else {
                for (i = 1; i < argc; i++) {
                        dir = path_canon(NULL,
@@ -689,7 +707,8 @@ int main(int argc, char *argv[])
                        prefix = path_rel(NULL, take(prefix), dir);
                        prefix = tal_strcat(NULL, take(prefix), ": ");
 
-                       pass &= test_module(&top.node, dir, prefix, summary);
+                       pass &= test_module(&top.node, dir, prefix, summary,
+                                           deps_fail_ignore);
                        reset_tests(&top.node);
                }
        }

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 8b6e81f75247f3cbcf0547e7b65de0ed509238a2..ae22fa8a8b7d5c3a8fb98841a911f8e6db6501fe 100644 (file)
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -190,6 +190,12 @@ extern bool safe_mode;
 /* Did the user want to keep all the results? */
 extern bool keep_results;
 
+/* Did we find non-ccan dependencies? */
+extern bool non_ccan_deps;
+
+/* Did we fail to build? */
+extern bool build_failed;
+
 /* Contents of config.h (or NULL if not found) */
 extern const char *config_header;
 

diff --git a/tools/ccanlint/tests/depends_exist.c b/tools/ccanlint/tests/depends_exist.c
index f69a08e432b4a91951f79c23735c11a1705e384b..09c187e98f54ccefb01c6072be479fce72784d93 100644 (file)
--- a/tools/ccanlint/tests/depends_exist.c
+++ b/tools/ccanlint/tests/depends_exist.c
@@ -63,8 +63,10 @@ static void check_depends_exist(struct manifest *m,
        }
 
        for (i = 0; deps[i]; i++) {
-               if (!strstarts(deps[i], "ccan/"))
+               if (!strstarts(deps[i], "ccan/")) {
+                       non_ccan_deps = true;
                        continue;
+               }
 
                if (!add_dep(m, &m->deps, deps[i], score))
                        return;

diff --git a/tools/ccanlint/tests/objects_build.c b/tools/ccanlint/tests/objects_build.c
index 21a02773aeb95dc18cbb11e7acbedeacba271372..d44b7e7464fd2410071697570fa9267a7de541bb 100644 (file)
--- a/tools/ccanlint/tests/objects_build.c
+++ b/tools/ccanlint/tests/objects_build.c
@@ -58,7 +58,8 @@ void build_objects(struct manifest *m,
        if (!errors) {
                score->pass = true;
                score->score = score->total - warnings;
-       }
+       } else
+               build_failed = true;
 }
 
 static void check_objs_build(struct manifest *m,