CI: homogenize logs

This commit is contained in:
Simon Duquennoy 2017-11-14 09:57:34 +01:00
parent 665082ce97
commit b4c4c740fa
4 changed files with 6 additions and 6 deletions

View File

@ -36,13 +36,13 @@ summary: doxygen
@( \
1> summary; \
if [ -s doxygen.runerr ] ; then \
echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some errors. Please fix these." >> summary; \
echo "doxygen: FAIL\nDoxygen caused some errors. Please fix these." >> summary; \
echo "Errors:" >> summary; \
cat doxygen.runerr >> summary; \
echo >> summary; \
fi ; \
if [ -s $(DOCDIR)/doxygen.log ] ; then \
echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some warnings. Please fix these." >> summary; \
echo "doxygen: FAIL\nDoxygen caused some warnings. Please fix these." >> summary; \
echo "Warnings:" >> summary; \
cat $(DOCDIR)/doxygen.log >> summary; \
fi ; \

View File

@ -54,7 +54,7 @@ summary: $(LOGS)
@(\
for T in $(TOOLS) ; do \
if [ -f $$T.log.failed ] ; then \
echo tools/$$T: FAIL ಠ_ಠ >> $@;\
echo tools/$$T: FAIL >> $@;\
cat $$T.log >> $@;\
else \
echo tools/$$T: OK >> $@;\

View File

@ -82,7 +82,7 @@ tools:
@$(foreach tool, $(TOOLS), \
(((cd $(TOOLSDIR)/$(tool); make) > $(tool).report 2>&1) && \
(echo $(tool): OK | tee $(tool).summary) || \
(echo $(tool): FAIL ಠ_ಠ | tee $(tool).summary ; \
(echo $(tool): FAIL | tee $(tool).summary ; \
tail -10 $(tool).report > $(tool).faillog)) ; )
clean:

View File

@ -73,9 +73,9 @@ done
if [ $TESTCOUNT -ne $OKCOUNT ] ; then
# At least one test failed
echo "$BASENAME: TEST FAIL ಠ_ಠ ($OKCOUNT/$TESTCOUNT, failed seeds:$FAILSEEDS)" > $BASENAME.testlog;
printf "%-32s TEST FAIL %3d/%d -- failed seeds:%s\n" "$BASENAME" "$OKCOUNT" "$TESTCOUNT" "$FAILSEEDS" > $BASENAME.testlog;
else
echo "$BASENAME: TEST OK ($OKCOUNT/$TESTCOUNT)" > $BASENAME.testlog;
printf "%-32s TEST OK %3d/%d\n" "$BASENAME" "$OKCOUNT" "$TESTCOUNT" > $BASENAME.testlog;
fi
# We do not want Make to stop -> Return 0