Skip to content

Commit

Permalink
fixup! .murdock: Autotest supported kconfig for board in list
Browse files Browse the repository at this point in the history
  • Loading branch information
MrKevinWeiss committed May 20, 2021
1 parent 5408001 commit 61587cc
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
20 changes: 17 additions & 3 deletions .murdock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ native
samr21-xpro
"}

: ${TEST_KCONFIG_ENFORCE_APP_GROUPS:="
tests/periph_*
tests/congure_*
tests/xtimer_*
tests/ztimer_*
tests/prng_*
"}


: ${TEST_WITH_CONFIG_SUPPORTED:="examples/suit_update tests/driver_at86rf2xx_aes"}

export RIOT_CI_BUILD=1
Expand Down Expand Up @@ -48,9 +57,14 @@ DWQ_ENV="-E BOARDS -E APPS -E NIGHTLY -E RUN_TESTS -E ENABLE_TEST_CACHE
get_supported_kconfig_board_app() {
local board=$1
local appdir=$2
local supported_boards="$(TEST_KCONFIG=1 make --no-print-directory -C $appdir info-boards-supported)"
if is_in_list "${board}" "${supported_boards}"; then
if is_in_list "${board}" "${TEST_KCONFIG_BOARDS_AVAILABLE}"; then

if is_in_list "${board}" "${TEST_KCONFIG_BOARDS_AVAILABLE}"; then
if is_in_list "${board}" "${TEST_KCONFIG_ENFORCE_APP_GROUPS}"; then
return 0
fi
local supported_boards="$(TEST_KCONFIG=1 make --no-print-directory\
-C $appdir info-kconfig-boards-supported)"
if is_in_list "${board}" "${supported_boards}"; then
return 0
fi
fi
Expand Down
1 change: 1 addition & 0 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ GLOBAL_GOALS += buildtest \
info-boards-features-conflicting \
info-boards-features-missing \
info-boards-supported \
info-kconfig-boards-supported \
info-buildsizes info-buildsizes-diff \
#

Expand Down
8 changes: 6 additions & 2 deletions makefiles/info-global.inc.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.PHONY: info-buildsizes \
info-buildsizes-diff \
info-boards-supported \
info-kconfig-boards-supported \
info-boards-features-missing \
info-boards-features-blacklisted \
info-boards-features-conflicting \
Expand Down Expand Up @@ -132,13 +133,16 @@ info-buildsizes-diff:
done;

ifeq (1, $(TEST_KCONFIG))
info-boards-supported:
info-kconfig-boards-supported:
@[ -f app.config.test ] && echo $(BOARDS) || echo none
else
info-boards-supported:
info-kconfig-boards-supported:
@echo $(BOARDS)
endif

info-boards-supported:
@echo $(BOARDS)

info-boards-features-missing:
@for f in $(BOARDS_FEATURES_MISSING); do echo $${f}; done | column -t

Expand Down
5 changes: 4 additions & 1 deletion makefiles/tests/feature_resolution/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
.PHONY: all info-boards-supported
.PHONY: all info-boards-supported info-kconfig-boards-supported

TESTS := $(patsubst test-%.mk,run-%,$(wildcard test-*.mk))

all: $(TESTS)

info-kconfig-boards-supported:
@echo none

info-boards-supported:
@echo none

Expand Down

0 comments on commit 61587cc

Please sign in to comment.