riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4825 from gebart/pr/makefile-buildtest-toolchain

Browse Source 
buildtest: Pass TOOLCHAIN variable to build workers
This commit is contained in:
Oleg Hahm 2016-02-28 11:26:03 +01:00
commit e9b9589264
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
Makefile.buildtests
View File

@ -40,59 +40,60 @@ buildtest:
APP_RETRY=0; \ APP_RETRY=0; \
rm -rf "$$BINDIRBASE"; \ rm -rf "$$BINDIRBASE"; \
for BOARD in $$($(MAKE) -s info-boards-supported); do \ for BOARD in $$($(MAKE) -s info-boards-supported); do \
RIOTNOLINK=$$(echo $(BOARD_INSUFFICIENT_MEMORY) | grep $${BOARD} 2>&1 >/dev/null && echo 1); \ RIOTNOLINK=$$(echo $(BOARD_INSUFFICIENT_MEMORY) | grep $${BOARD} 2>&1 >/dev/null && echo 1); \
${COLOR_ECHO} -n "Building for $${BOARD} "; \ ${COLOR_ECHO} -n "Building for $${BOARD} "; \
[ -n "$${RIOTNOLINK}" ] && ${COLOR_ECHO} -n "(no linking) "; \ [ -n "$${RIOTNOLINK}" ] && ${COLOR_ECHO} -n "(no linking) "; \
for NTH_TRY in 1 2 3; do \ for NTH_TRY in 1 2 3; do \
${COLOR_ECHO} -n ".. "; \ ${COLOR_ECHO} -n ".. "; \
LOG=$$(env -i \ LOG=$$(env -i \
HOME=$${HOME} \ HOME=$${HOME} \
PATH=$${PATH} \ PATH=$${PATH} \
BOARD=$${BOARD} \ BOARD=$${BOARD} \
CCACHE=$${CCACHE} \ CCACHE=$${CCACHE} \
CCACHE_DIR=$${CCACHE_DIR} \ CCACHE_DIR=$${CCACHE_DIR} \
CCACHE_BASEDIR=$${CCACHE_BASEDIR} \ CCACHE_BASEDIR=$${CCACHE_BASEDIR} \
RIOTBASE=$${RIOTBASE} \ RIOTBASE=$${RIOTBASE} \
RIOTBOARD=$${RIOTBOARD} \ RIOTBOARD=$${RIOTBOARD} \
RIOTCPU=$${RIOTCPU} \ RIOTCPU=$${RIOTCPU} \
BINDIRBASE=$${BINDIRBASE} \ BINDIRBASE=$${BINDIRBASE} \
RIOTNOLINK=$${RIOTNOLINK} \ RIOTNOLINK=$${RIOTNOLINK} \
RIOT_VERSION=$${RIOT_VERSION} \ RIOT_VERSION=$${RIOT_VERSION} \
WERROR=$${WERROR} \ WERROR=$${WERROR} \
LTO=$${LTO} \ LTO=$${LTO} \
$(MAKE) -j$(NPROC) 2>&1) ; \ TOOLCHAIN=$${TOOLCHAIN} \
if [ "$${?}" = "0" ]; then \ $(MAKE) -j$(NPROC) 2>&1) ; \
${COLOR_ECHO} "${COLOR_GREEN}success${COLOR_RESET}"; \ if [ "$${?}" = "0" ]; then \
if [ -n "$${BUILDTEST_VERBOSE}" ]; then \ ${COLOR_ECHO} "${COLOR_GREEN}success${COLOR_RESET}"; \
echo "$${LOG}" | tail -n +2 | head -n -2 | grep -v -E '^Building application|^\"make|^patching' | awk 'NF'; \ if [ -n "$${BUILDTEST_VERBOSE}" ]; then \
fi; \ echo "$${LOG}" | tail -n +2 | head -n -2 | grep -v -E '^Building application|^\"make|^patching' | awk 'NF'; \
elif [ -n "$${RIOT_DO_RETRY}" ] && [ "$${APP_RETRY}" -lt "3" ] && [ $${NTH_TRY} != 3 ]; then \ fi; \
${COLOR_ECHO} -n "${COLOR_PURPLE}retrying${COLOR_RESET} "; \ elif [ -n "$${RIOT_DO_RETRY}" ] && [ "$${APP_RETRY}" -lt "3" ] && [ $${NTH_TRY} != 3 ]; then \
continue; \ ${COLOR_ECHO} -n "${COLOR_PURPLE}retrying${COLOR_RESET} "; \
else \ continue; \
${COLOR_ECHO} "${COLOR_RED}failed${COLOR_RESET}"; \ else \
if [ -n "$${BUILDTEST_VERBOSE}" ]; then \ ${COLOR_ECHO} "${COLOR_RED}failed${COLOR_RESET}"; \
echo "$${LOG}" | grep -v -E '^\"make'; \ if [ -n "$${BUILDTEST_VERBOSE}" ]; then \
fi; \ echo "$${LOG}" | grep -v -E '^\"make'; \
APP_RETRY=`expr $${APP_RETRY} + 1`; \ fi; \
BUILDTESTOK=false; \ APP_RETRY=`expr $${APP_RETRY} + 1`; \
fi; \ BUILDTESTOK=false; \
break; \ fi; \
done; \ break; \
env -i \ done; \
HOME=$${HOME} \ env -i \
PATH=$${PATH} \ HOME=$${HOME} \
BOARD=$${BOARD} \ PATH=$${PATH} \
CCACHE=$${CCACHE} \ BOARD=$${BOARD} \
CCACHE_DIR=$${CCACHE_DIR} \ CCACHE=$${CCACHE} \
CCACHE_BASEDIR=$${CCACHE_BASEDIR} \ CCACHE_DIR=$${CCACHE_DIR} \
RIOTBASE=$${RIOTBASE} \ CCACHE_BASEDIR=$${CCACHE_BASEDIR} \
RIOTBOARD=$${RIOTBOARD} \ RIOTBASE=$${RIOTBASE} \
RIOTCPU=$${RIOTCPU} \ RIOTBOARD=$${RIOTBOARD} \
BINDIRBASE=$${BINDIRBASE} \ RIOTCPU=$${RIOTCPU} \
RIOTNOLINK=$${RIOTNOLINK} \ BINDIRBASE=$${BINDIRBASE} \
RIOT_VERSION=$${RIOT_VERSION} \ RIOTNOLINK=$${RIOTNOLINK} \
$(MAKE) clean-intermediates 2>&1 >/dev/null || true; \ RIOT_VERSION=$${RIOT_VERSION} \
$(MAKE) clean-intermediates 2>&1 >/dev/null || true; \
done; \ done; \
$${BUILDTESTOK} $${BUILDTESTOK}
endif # BUILD_IN_DOCKER endif # BUILD_IN_DOCKER