Don't run dependent tests if one fails.

[ccan] / tools / ccanlint / ccanlint.c

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 1164c314ec3446637bfab88b69c972753b3fdab7..f88b58dc8e8ba3b416bb10a1469684258782c1bb 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -25,18 +25,21 @@
 #include <string.h>
 #include <err.h>
 #include <ctype.h>
+#include <ccan/talloc/talloc.h>
 
 static unsigned int verbose = 0;
 static LIST_HEAD(compulsory_tests);
 static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
+bool safe_mode = false;
 
 static void usage(const char *name)
 {
-       fprintf(stderr, "Usage: %s [-s] [-v] [-d <dirname>]\n"
+       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d <dirname>]\n"
                "   -v: verbose mode\n"
                "   -s: simply give one line per FAIL and total score\n"
-               "   -d: use this directory instead of the current one\n",
+               "   -d: use this directory instead of the current one\n"
+               "   -n: do not compile anything\n",
                name);
        exit(1);
 }
@@ -97,6 +100,9 @@ static bool run_test(struct ccanlint *i,
        else
                this_score = 0;
 
+       list_del(&i->list);
+       list_add_tail(&finished_tests, &i->list);
+
        *score += this_score;
        if (summary) {
                printf("%s FAILED (%u/%u)\n",
@@ -104,17 +110,22 @@ static bool run_test(struct ccanlint *i,
 
                if (verbose)
                        indent_print(i->describe(m, result));
-               list_del(&i->list);
-               list_add_tail(&finished_tests, &i->list);
-               return false;
+       } else {
+               printf("%s\n", i->describe(m, result));
+
+               if (i->handle)
+                       i->handle(m, result);
        }
 
-       printf("%s\n", i->describe(m, result));
+       /* Skip any tests which depend on this one. */
+       list_for_each(&i->dependencies, d, node) {
+               list_del(&d->dependent->list);
+               list_add(&finished_tests, &d->dependent->list);
+               if (verbose)
+                       printf("  -> skipping %s\n", d->dependent->name);
+               *total_score += d->dependent->total_score;
+       }
 
-       if (i->handle)
-               i->handle(m, result);
-       list_del(&i->list);
-       list_add_tail(&finished_tests, &i->list);
        return false;
 }
 
@@ -208,7 +219,7 @@ int main(int argc, char *argv[])
 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: getopt_long ccan package? */
-       while ((c = getopt(argc, argv, "sd:v")) != -1) {
+       while ((c = getopt(argc, argv, "sd:vn")) != -1) {
                switch (c) {
                case 'd':
                        if (chdir(optarg) != 0)
@@ -220,6 +231,9 @@ int main(int argc, char *argv[])
                case 'v':
                        verbose++;
                        break;
+               case 'n':
+                       safe_mode = true;
+                       break;
                default:
                        usage(argv[0]);
                }
@@ -228,7 +242,7 @@ int main(int argc, char *argv[])
        if (optind < argc)
                usage(argv[0]);
 
-       m = get_manifest();
+       m = get_manifest(talloc_autofree_context());
 
        init_tests();
 
@@ -249,6 +263,5 @@ int main(int argc, char *argv[])
                        run_test(i, summary, &score, &total_score, m);
        }
        printf("Total score: %u/%u\n", score, total_score);
-
        return 0;
 }