From 3864d33ede150a017b6957b5dde2f22cdc5c0cea Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Wed, 5 Feb 2014 08:53:54 +0100 Subject: [PATCH 1/3] make buildtest more readable --- Makefile.include | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.include b/Makefile.include index e02bf2ac5..17b916d28 100644 --- a/Makefile.include +++ b/Makefile.include @@ -113,5 +113,17 @@ debug: buildtest: @for BOARD in $$(find $(RIOTBOARD) -mindepth 1 -maxdepth 1 -type d \! -name \*-common -printf '%f\n' ); do \ echo -n "Building for $${BOARD} .. "; \ - env -i HOME=$${HOME} PATH=$${PATH} BOARD=$${BOARD} RIOTBASE=$${RIOTBASE} RIOTBOARD=$${RIOTBOARD} RIOTCPU=$${RIOTCPU} $(MAKE) -B clean all >/dev/null 2>&1 && echo -e "\033[1;32msuccess\033[0m" || echo -e "\033[1;31mfailed\033[0m" ; \ - done + env -i \ + HOME=$${HOME} \ + PATH=$${PATH} \ + BOARD=$${BOARD} \ + RIOTBASE=$${RIOTBASE} \ + RIOTBOARD=$${RIOTBOARD} \ + RIOTCPU=$${RIOTCPU} \ + $(MAKE) -B clean all >/dev/null 2>&1 ; \ + if [ "$${?}" = "0" ]; then \ + echo -e "\033[1;32msuccess\033[0m"; \ + else \ + echo -e "\033[1;31mfailed\033[0m"; \ + fi; \ + done; \ From 351dea1dbd5d5b252d2e089f303f712e865f89c3 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Wed, 5 Feb 2014 08:55:43 +0100 Subject: [PATCH 2/3] decolorize buildtest output for jenkins/monochrome --- Makefile.include | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.include b/Makefile.include index 17b916d28..c97ae544e 100644 --- a/Makefile.include +++ b/Makefile.include @@ -111,8 +111,16 @@ debug: $(DEBUGGER) $(DEBUGGER_FLAGS) buildtest: - @for BOARD in $$(find $(RIOTBOARD) -mindepth 1 -maxdepth 1 -type d \! -name \*-common -printf '%f\n' ); do \ - echo -n "Building for $${BOARD} .. "; \ + @if [ -z "$${JENKINS_URL}" ] && tput colors 2>&1 > /dev/null; then \ + GREEN='\033[1;32m'; RED='\033[1;31m'; RESET='\033[0m'; \ + ECHO='echo -e'; \ + else \ + GREEN=''; RED=''; RESET=''; \ + ECHO='echo'; \ + fi; \ + \ + for BOARD in $$(find $(RIOTBOARD) -mindepth 1 -maxdepth 1 -type d \! -name \*-common -printf '%f\n' ); do \ + $${ECHO} -n "Building for $${BOARD} .. "; \ env -i \ HOME=$${HOME} \ PATH=$${PATH} \ @@ -122,8 +130,8 @@ buildtest: RIOTCPU=$${RIOTCPU} \ $(MAKE) -B clean all >/dev/null 2>&1 ; \ if [ "$${?}" = "0" ]; then \ - echo -e "\033[1;32msuccess\033[0m"; \ + $${ECHO} "$${GREEN}success$${RESET}"; \ else \ - echo -e "\033[1;31mfailed\033[0m"; \ + $${ECHO} "$${RED}failed$${RESET}"; \ fi; \ done; \ From 9ab441e091008e986862d7a110d5ba68ef50209e Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Wed, 5 Feb 2014 08:56:15 +0100 Subject: [PATCH 3/3] make buildtest fail on error --- Makefile.include | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.include b/Makefile.include index c97ae544e..463548ed4 100644 --- a/Makefile.include +++ b/Makefile.include @@ -133,5 +133,9 @@ buildtest: $${ECHO} "$${GREEN}success$${RESET}"; \ else \ $${ECHO} "$${RED}failed$${RESET}"; \ + BUILDTESTFAILED=1; \ fi; \ done; \ + if [ "$${BUILDTESTFAILED}" = "1" ]; then \ + exit 1; \ + fi