tdb: use tdb_nest_lock() for active lock.

[ccan] / tools / ccanlint / ccanlint.c

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 1399edcbc0772dc9eb17a021ab03a772286b88fd..330866d15f1f9365ba336893bb7e36382ccb55fa 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -17,6 +17,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "ccanlint.h"
+#include "../tools.h"
 #include <unistd.h>
 #include <getopt.h>
 #include <stdarg.h>
@@ -37,13 +38,14 @@ static void usage(const char *name)
 {
        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"
+               "   -s: simply give one line summary\n"
                "   -d: use this directory instead of the current one\n"
                "   -n: do not compile anything\n",
                name);
        exit(1);
 }
 
+#if 0
 static void indent_print(const char *string)
 {
        while (*string) {
@@ -56,6 +58,7 @@ static void indent_print(const char *string)
                string += line;
        }
 }
+#endif
 
 bool ask(const char *question)
 {
@@ -82,7 +85,7 @@ static const char *should_skip(struct manifest *m, struct ccanlint *i)
 }
 
 static bool run_test(struct ccanlint *i,
-                    bool summary,
+                    bool quiet,
                     unsigned int *score,
                     unsigned int *total_score,
                     struct manifest *m)
@@ -116,8 +119,13 @@ static bool run_test(struct ccanlint *i,
 
        result = i->check(m);
        if (!result) {
-               if (verbose)
-                       printf("  %s: OK\n", i->name);
+               if (verbose) {
+                       printf("  %s: OK", i->name);
+                       if (i->total_score)
+                               printf(" (+%u/%u)",
+                                      i->total_score, i->total_score);
+                       printf("\n");
+               }
                if (i->total_score) {
                        *score += i->total_score;
                        *total_score += i->total_score;
@@ -138,13 +146,11 @@ static bool run_test(struct ccanlint *i,
 
        *total_score += i->total_score;
        *score += this_score;
-       if (summary) {
-               printf("%s FAILED (%u/%u)\n",
+       if (verbose) {
+               printf("  %s: FAIL (+%u/%u)\n",
                       i->name, this_score, i->total_score);
-
-               if (verbose)
-                       indent_print(i->describe(m, result));
-       } else {
+       }
+       if (!quiet) {
                printf("%s\n", i->describe(m, result));
 
                if (i->handle)
@@ -244,17 +250,20 @@ int main(int argc, char *argv[])
 {
        int c;
        bool summary = false;
-       unsigned int score, total_score;
+       unsigned int score = 0, total_score = 0;
        struct manifest *m;
        struct ccanlint *i;
+       const char *prefix = "", *dir = ".";
 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: getopt_long ccan package? */
        while ((c = getopt(argc, argv, "sd:vn")) != -1) {
                switch (c) {
                case 'd':
-                       if (chdir(optarg) != 0)
-                               err(1, "Changing into directory '%s'", optarg);
+                       dir = optarg;
+                       prefix = talloc_append_string(talloc_basename(NULL,
+                                                                     optarg),
+                                                     ": ");
                        break;
                case 's':
                        summary = true;
@@ -273,7 +282,7 @@ int main(int argc, char *argv[])
        if (optind < argc)
                usage(argv[0]);
 
-       m = get_manifest(talloc_autofree_context());
+       m = get_manifest(talloc_autofree_context(), dir);
 
        init_tests();
 
@@ -282,16 +291,16 @@ int main(int argc, char *argv[])
                printf("Compulsory tests:\n");
 
        while ((i = get_next_test(&compulsory_tests)) != NULL) {
-               if (!run_test(i, summary, &score, &total_score, m))
-                       exit(1);
+               if (!run_test(i, summary, &score, &total_score, m)) {
+                       errx(1, "%s%s failed", prefix, i->name);
+               }
        }
 
        if (verbose)
                printf("\nNormal tests:\n");
-       score = total_score = 0;
        while ((i = get_next_test(&normal_tests)) != NULL)
                run_test(i, summary, &score, &total_score, m);
 
-       printf("Total score: %u/%u\n", score, total_score);
+       printf("%sTotal score: %u/%u\n", prefix, score, total_score);
        return 0;
 }