X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=e10c9601a95ce8f56ff7b2c12f9acaaf13c0bf53;hp=6329f05b46b9515d05bfe84d72f9f56ff76d817f;hb=8da574fe7c6021afcb0afb8ae3a6bd462ee14413;hpb=a13257dd9b06ccd236092ccb7df8e1239ba79fa6;ds=sidebyside

diff --git a/Makefile b/Makefile
index 6329f05b..e10c9601 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,131 @@
-# Hacky makefile to compile everything and run the tests in some kind of sane order.
-# V=--verbose for verbose tests.
+# Hacky makefile to compile everything and run the tests in some kind
+# of sane order.
 
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
+# Main targets:
+# 
+# check: run tests on all ccan modules (use 'make check V=--verbose' for more)
+#        Includes building libccan.a.
+# libccan.a: A library with all the ccan modules in it.
+# tools: build useful tools in tools/ dir.
+#        Especially tools/ccanlint/ccanlint and tools/namespacize.
+# distclean: destroy everything back to pristine state
 
-ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
-ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
-ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_LIBS=$(patsubst %, ccan/%.o, $(ALL))
+# Trying to build the whole repo is usually a lose; there will be some
+# dependencies you don't have.
+EXCLUDE=wwviaudio ogg_to_pcm jmap jbitset nfs
 
-libccan.a: $(ALL_LIBS)
-	$(AR) r $@ $^
+# Where make scores puts the results
+SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
 
-check: $(ALL_DIRS:%=test-%)
+ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
+
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(REALLY_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
+
+fastcheck: $(ALL_TESTS:%=summary-fastcheck-%)
+
+check: $(ALL_TESTS:%=summary-check-%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
+scores: $(SCOREDIR)/SUMMARY
+
+$(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info))
+	git describe --always > $@
+	uname -a >> $@
+	$(CC) -v >> $@
+	cat $^ | grep 'Total score:' >> $@
+
+$(SCOREDIR)/score-%: ccan/%/_info tools/ccanlint/ccanlint $(OBJFILES)
+	mkdir -p $(SCOREDIR)
+	tools/ccanlint/ccanlint -v -s -d ccan/$* > $@ || true
+
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
 	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-$(ALL_LIBS):
-	$(LD) -r -o $@ $^ /dev/null
+# Actual dependencies are created in inter-depends
+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/$*
 
-test-ccan/%: tools/run_tests ccan/%.o
-	@echo Testing $*...
-	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+ccan/%/info: ccan/%/_info
+	$(CC) $(CCAN_CFLAGS) -o $@ -x c $<
 
-ccanlint: tools/ccanlint/ccanlint
+libccan.a(%.o): ccan/%.o
+	$(AR) r $@ $<
 
 clean: tools-clean
-	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
-	$(RM) inter-depends lib-depends test-depends
+	$(RM) `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'`
+	$(RM) inter-depends lib-depends test-depends ccan/*-Makefile
 
-inter-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/\1.o,p' < $$f`; done > $@
+# 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 > $@
 
-test-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; 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 > $@
 
-lib-depends: $(foreach D,$(ALL),$(wildcard $D/*.[ch]))
-	for c in $(ALL); do echo ccan/$$c.o: `ls ccan/$$c/*.c | grep -v /_info.c | sed 's/.c$$/.o/'`; done > $@
+config.h: tools/configurator/configurator Makefile Makefile-ccan
+	@tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > config.h
 
 include tools/Makefile
 -include inter-depends
 -include test-depends
--include lib-depends
+-include Makefile-web