X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=28ea503bfe7641e8ff77311c0951eeee947becdc;hp=a9b13ff36baa9787499bca4cba44995460148ffe;hb=ce58fbd1aaba9710d38001455ab46da4d3125358;hpb=655f0a840a92b10960ee942884548a4ef8f397d6

diff --git a/Makefile b/Makefile
index a9b13ff3..28ea503b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 
 # 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
+EXCLUDE=wwviaudio ogg_to_pcm
 
 # Anything with an _info file is a module.
 ALL=$(filter-out $(EXCLUDE), $(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info)))
@@ -20,21 +20,72 @@ ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 # Not all modules have tests.
 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)
 
 $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
-	@tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
 # Actual dependencies are created in inter-depends
 check-%: tools/ccanlint/ccanlint
-	@tools/ccanlint/ccanlint -s -d ccan/$*
+	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 $<
@@ -44,16 +95,16 @@ 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
-	@for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
+	for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
 
 # Creates dependencies between tests, so if foo depends on bar, bar is tested
 # first 
 test-depends: $(ALL_DEPENDS) Makefile
-	@for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
+	for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
 
 include tools/Makefile
 -include inter-depends