ccanlint: always catch timeouts, and force kill valgrind etc.

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index a9b13ff36baa9787499bca4cba44995460148ffe..e427c5d27b055412262ea6d044d34590aa3af410 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ default: libccan.a
 
 include Makefile-ccan
 
-check: $(ALL_TESTS:%=check-%)
+check: $(ALL_TESTS:%=summary-check-%)
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
@@ -34,6 +34,10 @@ $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
 
 # Actual dependencies are created in inter-depends
 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
@@ -44,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