ccanlint: fix compiler warning about return value of symlink.

[ccan] / tools / ccanlint / ccanlint.c

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index b7aaef1c9fc0e1c915ec0bd4f8c65b266234e121..179f270344cd00a4a8109e18384bb6d555bf5d21 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -31,7 +31,7 @@
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/talloc/talloc.h>
 
-static unsigned int verbose = 0;
+unsigned int verbose = 0;
 static LIST_HEAD(compulsory_tests);
 static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
@@ -42,7 +42,7 @@ static unsigned int timeout;
 static void usage(const char *name)
 {
        fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>] [-k <test>]*\n"
-               "   -v: verbose mode\n"
+               "   -v: verbose mode (can specify more than once)\n"
                "   -s: simply give one line summary\n"
                "   -d: use this directory instead of the current one\n"
                "   -n: do not compile anything\n"
@@ -106,6 +106,7 @@ static bool run_test(struct ccanlint *i,
        unsigned int this_score, timeleft;
        const struct dependent *d;
        const char *skip;
+       bool bad, good;
 
        //one less test to run through
        list_for_each(&i->dependencies, d, node)
@@ -137,52 +138,50 @@ static bool run_test(struct ccanlint *i,
                skip = "timeout";
                goto skip;
        }
-       if (!result) {
-               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;
-               }
 
-               list_del(&i->list);
-               list_add_tail(&finished_tests, &i->list);
-               return true;
-       }
-
-       if (i->score)
+       if (!result)
+               this_score = i->total_score ? i->total_score : 1;
+       else if (i->score)
                this_score = i->score(m, result);
        else
                this_score = 0;
 
-       list_del(&i->list);
-       list_add_tail(&finished_tests, &i->list);
+       bad = (this_score == 0);
+       good = (this_score >= i->total_score);
 
-       *total_score += i->total_score;
-       *score += this_score;
-       if (verbose) {
-               printf("  %s: FAIL (+%u/%u)\n",
-                      i->name, this_score, i->total_score);
+       if (verbose || (bad && !quiet)) {
+               printf("  %s: %s", i->name,
+                      bad ? "FAIL" : good ? "PASS" : "PARTIAL");
+               if (i->total_score)
+                       printf(" (+%u/%u)",
+                                      this_score, i->total_score);
+               printf("\n");
        }
-       if (!quiet) {
-               printf("%s\n", i->describe(m, result));
 
+       if (!quiet && result) {
+               const char *desc;
+               if (i->describe && (desc = i->describe(m, result)) != NULL) 
+                       printf("    %s\n", desc);
                if (i->handle)
                        i->handle(m, result);
        }
 
-       /* Skip any tests which depend on this one. */
-       list_for_each(&i->dependencies, d, node) {
-               d->dependent->skip = true;
-               d->dependent->skip_fail = true;
+       if (i->total_score) {
+               *score += this_score;
+               *total_score += i->total_score;
        }
 
-       return false;
+       list_del(&i->list);
+       list_add_tail(&finished_tests, &i->list);
+
+       if (bad) {
+               /* Skip any tests which depend on this one. */
+               list_for_each(&i->dependencies, d, node) {
+                       d->dependent->skip = true;
+                       d->dependent->skip_fail = true;
+               }
+       }
+       return good;
 }
 
 static void register_test(struct list_head *h, struct ccanlint *test, ...)
@@ -337,18 +336,22 @@ int main(int argc, char *argv[])
        unsigned int score = 0, total_score = 0;
        struct manifest *m;
        struct ccanlint *i;
-       const char *prefix = "", *dir = ".";
+       const char *prefix = "", *dir = talloc_getcwd(NULL);
        
        init_tests();
 
        exclude = btree_new(btree_strcmp);
 
        /* I'd love to use long options, but that's not standard. */
-       /* FIXME: getopt_long ccan package? */
+       /* FIXME: popt ccan package? */
        while ((c = getopt(argc, argv, "sd:vnlx:t:k:")) != -1) {
                switch (c) {
                case 'd':
-                       dir = optarg;
+                       if (optarg[0] != '/')
+                               dir = talloc_asprintf_append(NULL, "%s/%s",
+                                                            dir, optarg);
+                       else
+                               dir = optarg;
                        prefix = talloc_append_string(talloc_basename(NULL,
                                                                      optarg),
                                                      ": ");
@@ -387,8 +390,20 @@ int main(int argc, char *argv[])
        if (optind < argc)
                usage(argv[0]);
 
+       if (verbose >= 3)
+               tools_verbose = true;
+
+       /* We move into temporary directory, so gcov dumps its files there. */
+       if (chdir(temp_dir(talloc_autofree_context())) != 0)
+               err(1, "Error changing to %s temporary dir", temp_dir(NULL));
+
        m = get_manifest(talloc_autofree_context(), dir);
 
+       /* Create a symlink from temp dir back to src dir's test directory. */
+       if (symlink(talloc_asprintf(m, "%s/test", dir),
+                   talloc_asprintf(m, "%s/test", temp_dir(NULL))) != 0)
+               err(1, "Creating test symlink in %s", temp_dir(NULL));
+
        /* If you don't pass the compulsory tests, you don't even get a score */
        if (verbose)
                printf("Compulsory tests:\n");