X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile;h=127b8757808eedeabec2c53425ef0850c89ce5c6;hp=888afcad8ac98ad07d3e989023cba96e5149e511;hb=d81e79b8dfdfb0da8766c022e767a5b040e5d07b;hpb=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1

diff --git a/Makefile b/Makefile
index 888afcad..127b8757 100644
--- a/Makefile
+++ b/Makefile
@@ -5,48 +5,91 @@
 # 
 # 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))
+# Where make scores puts the results
+SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
+CCANLINT=tools/ccanlint/ccanlint --deps-fail-ignore
+CCANLINT_FAST=$(CCANLINT) -x tests_pass_valgrind -x tests_compile_coverage
+
+default: all_info libccan.a
+
+ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS))
+
+# By default, we skip modules with external deps (or plaform specific)
+MODS_EXCLUDE:=altstack generator jmap jset nfs ogg_to_pcm tal/talloc wwviaudio
+# This randomly fails, and reliably fails under Jenkins :(
+MODS_FLAKY:=altstack
+MODS_RELIABLE=$(filter-out $(MODS_FLAKY),$(MODS))
 
 include Makefile-ccan
 
-check: $(ALL_DIRS:%=test-%)
-	echo $(ALL_DIRS)
+fastcheck: $(MODS_RELIABLE:%=summary-fastcheck/%)
+
+check: $(MODS_RELIABLE:%=summary-check/%)
 
 distclean: clean
 	rm -f $(ALL_DEPENDS)
 
-# Override implicit attempt to link directory.
-$(ALL_DIRS):
-	@touch $@
+scores: $(SCOREDIR)/SUMMARY
 
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
+$(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 `dirname $@`
+	$(CCANLINT) -v -s ccan/$* > $@ || true
+
+$(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
 	tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-test-ccan/%: tools/run_tests libccan.a(%.o)
-	@echo Testing $*...
-	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+# Actual dependencies are created in inter-depends
+check/%: tools/ccanlint/ccanlint
+	$(CCANLINT) ccan/$*
+
+fastcheck/%: tools/ccanlint/ccanlint
+	$(CCANLINT_FAST) ccan/$*
 
-# Some don't have object files.
-test-ccan/%:: tools/run_tests
-	@echo Testing $*...
-	@if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+# Doesn't test dependencies, doesn't print verbose fail results.
+summary-check/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT) -s ccan/$*
+
+summary-fastcheck/%: tools/ccanlint/ccanlint $(OBJFILES)
+	$(CCANLINT_FAST) -s ccan/$*
+
+ccan/%/info: ccan/%/_info config.h
+	$(CC) $(CCAN_CFLAGS) -I. -o $@ -x c $<
+
+all_info: $(MODS:%=ccan/%/info)
 
 clean: tools-clean
-	$(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
-	$(RM) inter-depends lib-depends test-depends
+	rm -f `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'` `find ccan -name '*-Makefile'`
+	rm -f config.h
+	rm -f inter-depends lib-depends test-depends
+
+# 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 > $@
+
+# 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 > $@
+
+TAGS: FORCE
+	find * -name '*.[ch]' | xargs etags
 
-# Only list a dependency if there are object files to build.
-inter-depends: $(ALL_DEPENDS)
-	for f in $(ALL_DEPENDS); do echo test-ccan/$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f); do [ "$$(echo $$dir/[a-z]*.c)" = "$$dir/[a-z]*.c" ] || echo libccan.a\("$$(basename $$dir)".o\); done); done > $@
+FORCE:
 
-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 > $@
+# Ensure we don't end up with empty file if configurator fails!
+config.h: tools/configurator/configurator Makefile Makefile-ccan
+	tools/configurator/configurator $(CC) $(CCAN_CFLAGS) > $@.tmp && mv $@.tmp $@
 
 include tools/Makefile
 -include inter-depends