tal: add general notifiers.

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index c50894d7a79771d27919ceb12aa9e8c799e86802..9c70f2ba823fddd99ca1864bbdd2346a41fb427c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,45 +13,6 @@
 # Where make scores puts the results
 SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
 
-# 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
 
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS_NORMAL) $(MODS_EXTERNAL))
@@ -67,14 +28,14 @@ distclean: clean
 
 scores: $(SCOREDIR)/SUMMARY
 
-$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/score-%)
+$(SCOREDIR)/SUMMARY: $(MODS:%=$(SCOREDIR)/%.score)
        git describe --always > $@
        uname -a >> $@
        $(CC) -v >> $@
        cat $^ | grep 'Total score:' >> $@
 
-$(SCOREDIR)/score-%: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
-       mkdir -p $(SCOREDIR)
+$(SCOREDIR)/%.score: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
+       mkdir -p `dirname $@`
        tools/ccanlint/ccanlint -v -s ccan/$* > $@ || true
 
 $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
@@ -85,7 +46,7 @@ check-%: tools/ccanlint/ccanlint
        tools/ccanlint/ccanlint ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
-       tools/ccanlint/ccanlint --timeout $(FASTTIMEOUT) ccan/$*
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
@@ -94,6 +55,13 @@ summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
 summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
        tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/$*
 
+# FIXME: Horrible hacks because % doesn't match /
+summary-fastcheck-antithread/%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/antithread/$*
+
+summary-fastcheck-tal/%: tools/ccanlint/ccanlint $(OBJFILES)
+       tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage -s ccan/tal/$*
+
 ccan/%/info: ccan/%/_info
        $(CC) $(CCAN_CFLAGS) -o $@ -x c $<