CI tests: cleaner compilation artifacts

This commit is contained in:
Simon Duquennoy 2017-12-17 23:23:07 -08:00
parent fa1842ccb5
commit 7e5ab3bf7c
2 changed files with 8 additions and 8 deletions

View File

@ -30,15 +30,15 @@ DOCDIR=../../tools/doxygen
all: clean summary all: clean summary
doxygen: doxygen:
@make -C $(DOCDIR) 2> doxygen.runerr > doxygen.runlog @make -C $(DOCDIR) 2> doxygen.err > /dev/null
summary: doxygen summary: doxygen
@( \ @( \
1> summary; \ 1> summary; \
if [ -s doxygen.runerr ] ; then \ if [ -s doxygen.err ] ; then \
echo "Doxygen: TEST FAIL" | tee summary; \ echo "Doxygen: TEST FAIL" | tee summary; \
echo "Errors:"; \ echo "Errors:"; \
cat doxygen.runerr; \ cat doxygen.err; \
fi ; \ fi ; \
if [ -s $(DOCDIR)/doxygen.log ] ; then \ if [ -s $(DOCDIR)/doxygen.log ] ; then \
echo "Doxygen: TEST FAIL" | tee summary; \ echo "Doxygen: TEST FAIL" | tee summary; \
@ -49,10 +49,10 @@ summary: doxygen
echo "Doxygen: TEST OK (no warning nor error)" | tee summary; \ echo "Doxygen: TEST OK (no warning nor error)" | tee summary; \
fi ; \ fi ; \
) )
@rm doxygen.runlog doxygen.runerr @rm doxygen.err
@echo "========== Summary ==========" @echo "========== Summary =========="
@cat summary @cat summary
clean: clean:
@rm -f summary doxygen.runlog doxygen.runerr @rm -f summary doxygen.err
@make -C $(DOCDIR) clean @make -C $(DOCDIR) clean

View File

@ -41,10 +41,10 @@ define dooneexample
@echo -n Building example $(3): $(1) $(4) for target $(2) @echo -n Building example $(3): $(1) $(4) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \ @((cd $(EXAMPLESDIR)/$(1); \
make $(4) TARGET=$(2) clean && make -j $(4) TARGET=$(2) WERROR=1) > \ make $(4) TARGET=$(2) clean && make -j $(4) TARGET=$(2) WERROR=1) > \
/dev/null 2>make.runerr && \ /dev/null 2>make.err && \
(echo " -> OK" && printf "%-75s %-35s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \ (echo " -> OK" && printf "%-75s %-35s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \
(echo " -> FAIL" && printf "%-75s %-35s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.runerr)) (echo " -> FAIL" && printf "%-75s %-35s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.err))
@rm -f make.runerr @rm -f make.err
endef endef
define doexample define doexample