tdb: more testcase fixup.

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index 8d53cbc68449ed475f4847c6ae511094f25108ce..e427c5d27b055412262ea6d044d34590aa3af410 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,21 @@
 #        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
 
 include Makefile-ccan
 
-check: $(ALL_TESTS:%=check-%)
+check: $(ALL_TESTS:%=summary-check-%)
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
@@ -29,9 +33,12 @@ $(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 -d ccan/$*
+
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
+       @tools/ccanlint/ccanlint -s -d ccan/$*
 
 ccan/%/info: ccan/%/_info
        $(CC) $(CFLAGS) -o $@ -x c $<
@@ -41,7 +48,7 @@ libccan.a(%.o): ccan/%.o
 
 clean: tools-clean
        $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name info` `find . -name '*.d'`
-       $(RM) inter-depends lib-depends test-depends
+       $(RM) inter-depends lib-depends test-depends ccan/*-Makefile
 
 # Creates a dependency from the tests to the object files which it needs.
 inter-depends: $(ALL_DEPENDS) Makefile