tools: more build convenience work

add EXCLUDES= with more obscure modules.
use ccanlint for "make check", finally.

diff --git a/Makefile b/Makefile
index 8d53cbc68449ed475f4847c6ae511094f25108ce..a9b13ff36baa9787499bca4cba44995460148ffe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,15 @@
 #        Especially tools/ccanlint/ccanlint and tools/namespacize.
 # distclean: destroy everything back to pristine state
 
+# Trying to build the whole repo is usually a lose; there will be some
+# dependencies you don't have.
+EXCLUDE=ccan/wwviaudio ccan/ogg_to_pcm
+
 # Anything with an _info file is a module.
-ALL=$(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info))
+ALL=$(filter-out $(EXCLUDE), $(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info)))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 # Not all modules have tests.
-ALL_TESTS=$(patsubst ccan/%/test/, %, $(wildcard ccan/*/test/))
+ALL_TESTS=$(patsubst ccan/%/test/, %, $(foreach dir, $(ALL), $(wildcard ccan/$(dir)/test/)))
 
 default: libccan.a
 
@@ -29,9 +33,8 @@ $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
        @tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
 # Actual dependencies are created in inter-depends
-check-%: tools/run_tests ccan/%/info
-       @echo Testing $*...
-       @if tools/run_tests $(V) $$(for f in `ccan/$*/info libs`; do echo --lib=$$f; done) `[ ! -f ccan/$*.o ] || echo --apiobj=ccan/$*.o` ccan/$* $(filter-out ccan/$*.o, $(filter %.o, $^)) | grep ^'not ok'; then exit 1; else exit 0; fi
+check-%: tools/ccanlint/ccanlint
+       @tools/ccanlint/ccanlint -s -d ccan/$*
 
 ccan/%/info: ccan/%/_info
        $(CC) $(CFLAGS) -o $@ -x c $<

diff --git a/Makefile-ccan b/Makefile-ccan
index 2e802dd5acbc50094f993d35309326536bda1ef1..bac2dd17c7bcc6f9004d9e0574544c1e6e615a0e 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -9,7 +9,7 @@ DEPGEN=-MD
 -include ccan/*/*.d
 
 # Every directory with .c files is included.
-DIRS=$(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c))))
+DIRS=$(filter-out $(EXCLUDE), $(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c)))))
 
 # We compile all the ccan/foo/*.o files together into ccan/foo.o
 OBJFILES=$(DIRS:=.o)

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 1399edcbc0772dc9eb17a021ab03a772286b88fd..4590ba8c34de081fdd909d381c4a3d2d0b106548 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)
@@ -138,13 +141,7 @@ static bool run_test(struct ccanlint *i,
 
        *total_score += i->total_score;
        *score += this_score;
-       if (summary) {
-               printf("%s FAILED (%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)
@@ -247,12 +244,16 @@ int main(int argc, char *argv[])
        unsigned int score, total_score;
        struct manifest *m;
        struct ccanlint *i;
+       const char *prefix = "";
 
        /* 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':
+                       prefix = talloc_append_string(talloc_basename(NULL,
+                                                                     optarg),
+                                                     ": ");
                        if (chdir(optarg) != 0)
                                err(1, "Changing into directory '%s'", optarg);
                        break;
@@ -282,8 +283,9 @@ 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)
@@ -292,6 +294,6 @@ int main(int argc, char *argv[])
        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;
 }