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

compile_test.py / buildtest: fix output for failed boards

Browse Source
This commit is contained in:
Philipp Rosenkranz 2015-07-10 01:49:22 +02:00
parent d15f0990b3
commit 94490ed031
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.buildtests
View File

@ -37,6 +37,7 @@ else
buildtest: buildtest:
@ \ @ \
BUILDTESTOK=true; \ BUILDTESTOK=true; \
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_RAM) | grep $${BOARD} 2>&1 >/dev/null && echo 1); \ RIOTNOLINK=$$(echo $(BOARD_INSUFFICIENT_RAM) | grep $${BOARD} 2>&1 >/dev/null && echo 1); \
@ -60,12 +61,13 @@ buildtest:
$(MAKE) -j$(NPROC) 2>&1) ; \ $(MAKE) -j$(NPROC) 2>&1) ; \
if [ "$${?}" = "0" ]; then \ if [ "$${?}" = "0" ]; then \
${COLOR_ECHO} "${COLOR_GREEN}success${COLOR_RESET}"; \ ${COLOR_ECHO} "${COLOR_GREEN}success${COLOR_RESET}"; \
elif [ -n "$${RIOT_DO_RETRY}" ] && $${BUILDTESTOK} && [ $${NTH_TRY} != 3 ]; then \ elif [ -n "$${RIOT_DO_RETRY}" ] && [ "$${APP_RETRY}" -lt "3" ] && [ $${NTH_TRY} != 3 ]; then \
${COLOR_ECHO} -n "${COLOR_PURPLE}retrying${COLOR_RESET} "; \ ${COLOR_ECHO} -n "${COLOR_PURPLE}retrying${COLOR_RESET} "; \
continue; \ continue; \
else \ else \
${COLOR_ECHO} "${COLOR_RED}failed${COLOR_RESET}"; \ ${COLOR_ECHO} "${COLOR_RED}failed${COLOR_RESET}"; \
echo "$${LOG}" | grep -v -E '^make(\[[[:digit:]]])?:'; \ echo "$${LOG}" | grep -v -E '^make(\[[[:digit:]]])?:'; \
APP_RETRY=`expr $${APP_RETRY} + 1`; \
BUILDTESTOK=false; \ BUILDTESTOK=false; \
fi; \ fi; \
break; \ break; \

3
dist/tools/compile_test/compile_test.py vendored
View File

@ -62,7 +62,7 @@ def get_lines(readline, prefix):
continue continue
result = result[len(prefix):].rstrip().split(' .. ')[::-1] result = result[len(prefix):].rstrip().split(' .. ')[::-1]
if (len(result) == 2) or (len(result) == 3 and 'retrying' in result[1]): if (len(result) > 1) and ('success' in result[0] or 'failed' in result[0]):
stdout.write('.') stdout.write('.')
stdout.flush() stdout.flush()
yield (' .. '.join(result[:-1]), result[-1]) yield (' .. '.join(result[:-1]), result[-1])
@ -177,7 +177,6 @@ for folder in ('examples', 'tests'):
success.append(application) success.append(application)
else: else:
failed.append(application) failed.append(application)
subprocess_env.pop('RIOT_DO_RETRY', None)
except Exception, e: except Exception, e:
print('\n\t\tException: {}'.format(e)) print('\n\t\tException: {}'.format(e))
exceptions.append(application) exceptions.append(application)