X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=b885875a4d6b3fcfa73c1c0b839c0f0db9ceee05;hp=c50894d7a79771d27919ceb12aa9e8c799e86802;hb=d873aaec1339baf45c37db7cbaa2d687656343ba;hpb=3785a28e52ed66f24355bf12c1d0f7b1908cd7e2

diff --git a/Makefile b/Makefile
index c50894d7..b885875a 100644
--- 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))
@@ -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 $<