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

tests: check Kconfig before setting CFLAGS for shell configs

Browse Source
This commit is contained in:
Leandro Lanzieri 2021-02-04 12:46:26 +01:00
parent 8a29cf285d
commit f0762c5114
No known key found for this signature in database
GPG Key ID: F4E9A721761C7593
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/gnrc_tcp/Makefile
View File

@ -12,8 +12,6 @@ TIMEOUT_MS ?= 3000
# Suppress test execution to avoid CI errors # Suppress test execution to avoid CI errors
TEST_ON_CI_BLACKLIST += all TEST_ON_CI_BLACKLIST += all
CFLAGS += -DCONFIG_SHELL_NO_ECHO
ifeq (native,$(BOARD)) ifeq (native,$(BOARD))
TERMFLAGS ?= $(TAP) TERMFLAGS ?= $(TAP)
else else
@ -54,3 +52,8 @@ endif
ifndef CONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS ifndef CONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS
CFLAGS += -DCONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS=$(TIMEOUT_MS) CFLAGS += -DCONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS=$(TIMEOUT_MS)
endif endif
# Set the shell echo configuration via CFLAGS if not being controlled via Kconfig
ifndef CONFIG_KCONFIG_USEMODULE_SHELL
CFLAGS += -DCONFIG_SHELL_NO_ECHO
endif

9
tests/test_tools/Makefile
View File

@ -3,9 +3,6 @@ include ../Makefile.tests_common
USEMODULE += shell USEMODULE += shell
# Disable shell echo and prompt to not have them in the way for testing
CFLAGS += -DCONFIG_SHELL_NO_ECHO=1 -DCONFIG_SHELL_NO_PROMPT=1
# No need for test_utils_interactive_sync in this test since the test # No need for test_utils_interactive_sync in this test since the test
# synchronizes by itself through `shellping` command. # synchronizes by itself through `shellping` command.
DISABLE_MODULE += test_utils_interactive_sync DISABLE_MODULE += test_utils_interactive_sync
@ -14,3 +11,9 @@ DISABLE_MODULE += test_utils_interactive_sync
USEMODULE += dummy_thread USEMODULE += dummy_thread
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include
# Set the shell echo configuration via CFLAGS if not being controlled via Kconfig
# Disable shell echo and prompt to not have them in the way for testing
ifndef CONFIG_KCONFIG_USEMODULE_SHELL
CFLAGS += -DCONFIG_SHELL_NO_ECHO -DCONFIG_SHELL_NO_PROMPT
endif