From 87a81d224ab46e44f8ec04ff158494bf0cb868d6 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 12 Mar 2019 11:18:44 +0100 Subject: [PATCH 1/2] murdock: pass on makefile error in get_app_board_toolchain_pairs() --- .murdock | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.murdock b/.murdock index 296a3bd142..edc17b6dae 100755 --- a/.murdock +++ b/.murdock @@ -109,7 +109,14 @@ get_supported_toolchains() { # supported board and toolchain. Only print for boards in $BOARDS. get_app_board_toolchain_pairs() { local appdir=$1 - for board in $(get_supported_boards $appdir) + local boards="$(get_supported_boards $appdir)" + + if [ "$boards" = makefile_broken ]; then + echo "$appdir makefile_broken" + return + fi + + for board in ${boards} do for toolchain in $(get_supported_toolchains $appdir $board) do From 864110dec484509ecd45c656ddd8244ba377c396 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 12 Mar 2019 11:28:14 +0100 Subject: [PATCH 2/2] murdock: implement extra check for broken makefile --- .murdock | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.murdock b/.murdock index edc17b6dae..462077ac93 100755 --- a/.murdock +++ b/.murdock @@ -144,7 +144,12 @@ compile() { local board=$(echo $2 | cut -f 1 -d':') local toolchain=$(echo $2 | cut -f 2 -d':') - [ "$board" = "makefile_broken" ] && error "$0: Makefile in \"$appdir\" seems to be broken!" + [ "$board" = "makefile_broken" ] && { + echo "$0: There seems to be a problem in \"$appdir\" while getting supported boards!" + echo "$0: testing \"make -C$appdir info-boards-supported\"..." + make -C$appdir info-boards-supported && echo "$0: success. no idea what's wrong." || echo "$0: failed!" + exit 1 + } # set build directory. CI ensures only one build at a time in $(pwd). export BINDIR="$(pwd)/build"