1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

dist/tools/insufficient_memory: always update Makefile.ci

Previously the `add_insufficient_memory_board.sh` script would only
add the tested board to `Makefile.ci` when resource requirements grew,
but never remove it when resource requirements got lower.

This updates the script to also remove boards from `Makefile.ci` if
it is no longer needed. It is also rename (`add` --> `update`) to
match the change in behavior.
This commit is contained in:
Marian Buschsieweke 2023-12-01 10:21:17 +01:00
parent a38ab98001
commit 922d8c8b9f
No known key found for this signature in database
GPG Key ID: 77AA882EC78084E6
3 changed files with 8 additions and 3 deletions

View File

@ -6,7 +6,8 @@ define create_Makefile.ci
@echo " #" >> $(1)
endef
BOARD_INSUFFICIENT_MEMORY += $(BOARD)
BOARD_INSUFFICIENT_MEMORY += $(ADD_BOARDS)
BOARD_INSUFFICIENT_MEMORY := $(filter-out $(REMOVE_BOARDS),$(BOARD_INSUFFICIENT_MEMORY))
.PHONY: Makefile.ci
ifeq ($(BOARD_INSUFFICIENT_MEMORY),)

View File

@ -80,4 +80,4 @@ for BOARD in $(EXTERNAL_BOARD_DIRS="" make --no-print-directory info-boards-sup
done
rm "${APP_DIR}/Makefile.ci"
make -f "$(dirname "$0")"/Makefile.for_sh DIR="${APP_DIR}" BOARD="${BOARDS}" Makefile.ci > /dev/null
make -f "$(dirname "$0")"/Makefile.for_sh DIR="${APP_DIR}" ADD_BOARDS="${BOARDS}" Makefile.ci > /dev/null

View File

@ -53,6 +53,10 @@ APPLICATIONS="${APPLICATIONS} $(make -sC "${RIOTBASE}" info-applications)"
for application in ${APPLICATIONS}; do
printf "${CNORMAL}%-40s${CRESET}" "${application}"
# First, remove the board from Makefile.ci; otherwise linking step will be
# skipped with RIOT_CI_BUILD=1 when the board is already in the list.
make -f "$(dirname "$0")"/Makefile.for_sh DIR="${RIOTBASE}/${application}" REMOVE_BOARDS="${BOARD}" Makefile.ci > /dev/null
# disable warning about globbing and word splitting for ${LOCAL_MAKE_ARGS}
# as this is exactly what we want here
# shellcheck disable=SC2086
@ -62,7 +66,7 @@ for application in ${APPLICATIONS}; do
-e "wraps around address space" \
"$TMPFILE" > /dev/null; then
printf "${CBIG}%s${CRESET}\n" "too big"
make -f "$(dirname "$0")"/Makefile.for_sh DIR="${RIOTBASE}/${application}" BOARD="${BOARD}" Makefile.ci > /dev/null
make -f "$(dirname "$0")"/Makefile.for_sh DIR="${RIOTBASE}/${application}" ADD_BOARDS="${BOARD}" Makefile.ci > /dev/null
elif grep -e "not whitelisted" \
-e "unsatisfied feature requirements" \
-e "Some feature requirements are blacklisted:" \