Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makefiles/tests/tests.inc.mk: use native term for tests #20215

Merged
merged 3 commits into from
Jan 2, 2024
Merged

makefiles/tests/tests.inc.mk: use native term for tests #20215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59b687c
boards/native: forward eeprom flags to pyterm
OlegHahm Dec 23, 2023
b166327
makefiles/tests/tests.inc.mk: use `native` term for tests
benpicco Dec 23, 2023
d8cc2ac
tests: don't manually select `native` term
benpicco Dec 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion boards/native/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ EEPROM_FILE ?= $(BINDIR)/native.eeprom
# set the eeprom file flags only when the periph_eeprom feature is used.
ifneq (,$(filter periph_eeprom,$(FEATURES_USED)))
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

VCAN_IFNUM ?= 0
Expand Down
4 changes: 4 additions & 0 deletions makefiles/tests/tests.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ TEST_DEPS += $(TERMDEPS)
TEST_EXECUTOR ?=
TEST_EXECUTOR_FLAGS ?=

ifeq (native, $(BOARD))
TEST_EXECUTOR := RIOT_TERMINAL=native $(TEST_EXECUTOR)
endif

test: $(TEST_DEPS)
$(Q) for t in $(TESTS); do \
$(TEST_EXECUTOR) $(TEST_EXECUTOR_FLAGS) $$t || exit 1; \
Expand Down
4 changes: 0 additions & 4 deletions tests/build_system/test_tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ include ../Makefile.build_system_common

USEMODULE += shell

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif

# No need for test_utils_interactive_sync in this test since the test
# synchronizes by itself through `shellping` command.
DISABLE_MODULE += test_utils_interactive_sync
Expand Down
3 changes: 0 additions & 3 deletions tests/periph/rtt_min/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ USEMODULE += xtimer
FEATURES_REQUIRED += periph_rtt
DISABLE_MODULE += periph_init_rtt

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
RIOT_TERMINAL ?= socat

# microbit qemu lacks rtt
Expand Down
4 changes: 0 additions & 4 deletions tests/rust_libs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ USEMODULE += shell_democommands

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
# pulled in through modules.
CARGO_CHANNEL = stable
Expand Down
3 changes: 0 additions & 3 deletions tests/sys/congure_reno/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ USEMODULE += shell_cmds_default

INCLUDES += -I$(CURDIR)

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat

Expand Down
3 changes: 0 additions & 3 deletions tests/sys/congure_test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ USEMODULE += shell_cmds_default

INCLUDES += -I$(CURDIR)

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat

Expand Down
3 changes: 0 additions & 3 deletions tests/sys/shell/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ USEMODULE += app_metadata
USEMODULE += shell_cmds_default
USEMODULE += ps

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat

Expand Down
3 changes: 0 additions & 3 deletions tests/sys/shell_ble/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ TESTRUNNER_SHELL_SKIP_REBOOT = 1
TESTRUNNER_RESET_BOARD_ON_STARTUP = 0

ifneq (,$(filter term,$(MAKECMDGOALS)))
ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif
# Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat
else ifneq (,$(filter test,$(MAKECMDGOALS)))
Expand Down
2 changes: 0 additions & 2 deletions tests/sys/shell_lock/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ DISABLE_MODULE += test_utils_interactive_sync_shell
# for z1, socat doesn't work (unknown reason)
ifeq (z1, $(BOARD))
RIOT_TERMINAL ?= pyterm
else ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif

# Use a terminal that does not introduce extra characters into the stream.
Expand Down
4 changes: 0 additions & 4 deletions tests/turo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ include ../Makefile.tests_common
USEMODULE += test_utils_result_output
USEMODULE += shell

ifeq (native, $(BOARD))
RIOT_TERMINAL ?= native
endif

# Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat

Expand Down
Loading