From 316116fee0cad61f7ee294a4425fd36b5e927caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Fri, 15 Jan 2016 19:39:17 +0100
Subject: [PATCH 1/2] Makefile.buildtests: Pass TOOLCHAIN variable to sub-make

---
 Makefile.buildtests | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.buildtests b/Makefile.buildtests
index 0f0e356185..1e679042a1 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -60,6 +60,7 @@ buildtest:
 					RIOT_VERSION=$${RIOT_VERSION} \
 					WERROR=$${WERROR} \
 					LTO=$${LTO} \
+					TOOLCHAIN=$${TOOLCHAIN} \
 					$(MAKE) -j$(NPROC) 2>&1) ; \
 			if [ "$${?}" = "0" ]; then \
 				${COLOR_ECHO} "${COLOR_GREEN}success${COLOR_RESET}"; \

From c2a98076c63fc828b2cf3cbde53f980020389128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Fri, 15 Jan 2016 19:43:10 +0100
Subject: [PATCH 2/2] Makefile.buildtests: Clean up indentation

---
 Makefile.buildtests | 108 ++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

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