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

Merge pull request #20215 from benpicco/tests/native-term

Browse Source 
makefiles/tests/tests.inc.mk: use native term for tests
This commit is contained in:
Marian Buschsieweke 2024-01-02 10:35:36 +00:00 committed by GitHub
commit 0aa87aa242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/native/Makefile.include
View File

@ -114,7 +114,11 @@ EEPROM_FILE ?= $(BINDIR)/native.eeprom
# set the eeprom file flags only when the periph_eeprom feature is used. # set the eeprom file flags only when the periph_eeprom feature is used.
ifneq (,$(filter periph_eeprom,$(FEATURES_USED))) ifneq (,$(filter periph_eeprom,$(FEATURES_USED)))
EEPROM_FILE_FLAGS = --eeprom $(EEPROM_FILE) EEPROM_FILE_FLAGS = --eeprom $(EEPROM_FILE)
TERMFLAGS += $(EEPROM_FILE_FLAGS) ifeq (native,$(RIOT_TERMINAL))
TERMFLAGS += $(EEPROM_FILE_FLAGS)
else
TERMFLAGS += --process-args '$(EEPROM_FILE_FLAGS)'
endif
endif endif
VCAN_IFNUM ?= 0 VCAN_IFNUM ?= 0

4
makefiles/tests/tests.inc.mk
View File

@ -22,6 +22,10 @@ TEST_DEPS += $(TERMDEPS)
TEST_EXECUTOR ?= TEST_EXECUTOR ?=
TEST_EXECUTOR_FLAGS ?= TEST_EXECUTOR_FLAGS ?=
ifeq (native, $(BOARD))
TEST_EXECUTOR := RIOT_TERMINAL=native $(TEST_EXECUTOR)
endif
test: $(TEST_DEPS) test: $(TEST_DEPS)
$(Q) for t in $(TESTS); do \ $(Q) for t in $(TESTS); do \
$(TEST_EXECUTOR) $(TEST_EXECUTOR_FLAGS) $$t || exit 1; \ $(TEST_EXECUTOR) $(TEST_EXECUTOR_FLAGS) $$t || exit 1; \

4
tests/build_system/test_tools/Makefile
View File

@ -3,10 +3,6 @@ include ../Makefile.build_system_common
USEMODULE += shell USEMODULE += shell
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# 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

3
tests/periph/rtt_min/Makefile
View File

@ -6,9 +6,6 @@ USEMODULE += xtimer
FEATURES_REQUIRED += periph_rtt FEATURES_REQUIRED += periph_rtt
DISABLE_MODULE += periph_init_rtt DISABLE_MODULE += periph_init_rtt
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat
# microbit qemu lacks rtt # microbit qemu lacks rtt

4
tests/rust_libs/Makefile
View File

@ -5,10 +5,6 @@ USEMODULE += shell_democommands
FEATURES_REQUIRED += rust_target FEATURES_REQUIRED += rust_target
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Testing on stable to ensure that no nightly features are needed when Rust is # Testing on stable to ensure that no nightly features are needed when Rust is
# pulled in through modules. # pulled in through modules.
CARGO_CHANNEL = stable CARGO_CHANNEL = stable

3
tests/sys/congure_reno/Makefile
View File

@ -7,9 +7,6 @@ USEMODULE += shell_cmds_default
INCLUDES += -I$(CURDIR) INCLUDES += -I$(CURDIR)
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat

3
tests/sys/congure_test/Makefile
View File

@ -7,9 +7,6 @@ USEMODULE += shell_cmds_default
INCLUDES += -I$(CURDIR) INCLUDES += -I$(CURDIR)
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat

3
tests/sys/shell/Makefile
View File

@ -5,9 +5,6 @@ USEMODULE += app_metadata
USEMODULE += shell_cmds_default USEMODULE += shell_cmds_default
USEMODULE += ps USEMODULE += ps
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat

3
tests/sys/shell_ble/Makefile
View File

@ -14,9 +14,6 @@ TESTRUNNER_SHELL_SKIP_REBOOT = 1
TESTRUNNER_RESET_BOARD_ON_STARTUP = 0 TESTRUNNER_RESET_BOARD_ON_STARTUP = 0
ifneq (,$(filter term,$(MAKECMDGOALS))) ifneq (,$(filter term,$(MAKECMDGOALS)))
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat
else ifneq (,$(filter test,$(MAKECMDGOALS))) else ifneq (,$(filter test,$(MAKECMDGOALS)))

2
tests/sys/shell_lock/Makefile
View File

@ -19,8 +19,6 @@ DISABLE_MODULE += test_utils_interactive_sync_shell
# for z1, socat doesn't work (unknown reason) # for z1, socat doesn't work (unknown reason)
ifeq (z1, $(BOARD)) ifeq (z1, $(BOARD))
RIOT_TERMINAL ?= pyterm RIOT_TERMINAL ?= pyterm
else ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.

4
tests/turo/Makefile
View File

@ -3,10 +3,6 @@ include ../Makefile.tests_common
USEMODULE += test_utils_result_output USEMODULE += test_utils_result_output
USEMODULE += shell USEMODULE += shell
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat