tcon: add testcase for const members in tcon_container_of()

[ccan] / Makefile

diff --git a/Makefile b/Makefile
index 65d0d8fc97f475ca9a5998a1ad509ce92cf528f8..127b8757808eedeabec2c53425ef0850c89ce5c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,18 +15,21 @@ SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shel
 CCANLINT=tools/ccanlint/ccanlint --deps-fail-ignore
 CCANLINT_FAST=$(CCANLINT) -x tests_pass_valgrind -x tests_compile_coverage
 
-default: libccan.a
+default: all_info libccan.a
 
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS))
 
-# By default, we skip modules with external deps.
-MODS_EXCLUDE:=jmap jset nfs ogg_to_pcm tal/talloc wwviaudio
+# 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
 
-fastcheck: $(MODS:%=summary-fastcheck-%)
+fastcheck: $(MODS_RELIABLE:%=summary-fastcheck/%)
 
-check: $(MODS:%=summary-check-%)
+check: $(MODS_RELIABLE:%=summary-check/%)
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
@@ -47,38 +50,28 @@ $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
        tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
 # Actual dependencies are created in inter-depends
-check-%: tools/ccanlint/ccanlint
+check/%: tools/ccanlint/ccanlint
        $(CCANLINT) ccan/$*
 
-fastcheck-%: tools/ccanlint/ccanlint
+fastcheck/%: tools/ccanlint/ccanlint
        $(CCANLINT_FAST) ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
-summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
+summary-check/%: tools/ccanlint/ccanlint $(OBJFILES)
        $(CCANLINT) -s ccan/$*
 
-summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
+summary-fastcheck/%: tools/ccanlint/ccanlint $(OBJFILES)
        $(CCANLINT_FAST) -s ccan/$*
 
-# FIXME: Horrible hacks because % doesn't match /
-summary-check-antithread/%: tools/ccanlint/ccanlint $(OBJFILES)
-       $(CCANLINT) -s ccan/antithread/$*
+ccan/%/info: ccan/%/_info config.h
+       $(CC) $(CCAN_CFLAGS) -I. -o $@ -x c $<
 
-summary-fastcheck-antithread/%: tools/ccanlint/ccanlint $(OBJFILES)
-       $(CCANLINT_FAST) -s ccan/antithread/$*
-
-summary-check-tal/%: tools/ccanlint/ccanlint $(OBJFILES)
-       $(CCANLINT) -s ccan/tal/$*
-
-summary-fastcheck-tal/%: tools/ccanlint/ccanlint $(OBJFILES)
-       $(CCANLINT_FAST) -s ccan/tal/$*
-
-ccan/%/info: ccan/%/_info
-       $(CC) $(CCAN_CFLAGS) -o $@ -x c $<
+all_info: $(MODS:%=ccan/%/info)
 
 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 ccan/*-Makefile
+       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
@@ -87,7 +80,7 @@ inter-depends: $(ALL_DEPENDS) Makefile
 # 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 > $@
 
 TAGS: FORCE
        find * -name '*.[ch]' | xargs etags