X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=4bdbf89c7fbb10422a1a2fb9b12d6a9fac58237e;hp=8d53cbc68449ed475f4847c6ae511094f25108ce;hb=67a035869c6f3512ba943ae197b407f182a4506d;hpb=570c9c555f076e74f46141bb42b5d1d7ac89f632

diff --git a/Makefile b/Makefile
index 8d53cbc6..4bdbf89c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,62 @@
 #        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=wwviaudio 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/)))
+
+# Here's my rough logarithmic timeout graph for my laptop:
+#
+# 302                                                  -     
+#    |                                                  / --*  
+#    |                                                 /       
+#    |                                                 /       
+#    |                                                /        
+#    |Execution Time, seconds                        /        
+#    |                                               /         
+#    |                                          ---//          
+#    |                                         /               
+#    |                                       //                
+#    |                    ---\            ---                  
+#    |                 ---    \\    ------                     
+#    |-----------------         \---                           
+# 19 +------------------------------------------------------+--
+#    0           Timeout (ms, logarithmic)               262144
+#
+# 140
+#    |                                                         
+#    |------------                                             
+#    |            ---                                          
+#    |               ---------                                 
+#    |                        -------                          
+#    |                               --\                       
+#    |                                  \\-                    
+#    | Tests skipped                       --\                 
+#    |                                        \                
+#    |                                         \\              
+#    |                                           \\\           
+#    |                                              \          
+#    |                                               \----     
+#  --+0---------------------------------------------------==+--
+#    0           Timeout (ms, logarithmic)               262144
+#
+# On my laptop, this runs 574 tests in 40 seconds, vs. a full check which
+# runs 676 tests in 260 seconds.
+FASTTIMEOUT=750
 
 default: libccan.a
 
 include Makefile-ccan
 
-check: $(ALL_TESTS:%=check-%)
+fastcheck: $(ALL_TESTS:%=summary-fastcheck-%)
+
+check: $(ALL_TESTS:%=summary-check-%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
@@ -29,9 +74,18 @@ $(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/$*
+
+fastcheck-%: tools/ccanlint/ccanlint
+	@tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -d ccan/$*
+
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
+	@tools/ccanlint/ccanlint -s -d ccan/$*
+
+summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
+	@tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -s -d ccan/$*
 
 ccan/%/info: ccan/%/_info
 	$(CC) $(CFLAGS) -o $@ -x c $<
@@ -41,7 +95,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