native: only set TERMFLAGS for pyterm

If TERMPROG is unset the default is pyterm. If TERMPROG is pyterm we
need to set the native flag.

boards/native/Makefile.include

@@ -14,7 +14,11 @@ RESET ?= $(RIOTBOARD)/native/dist/reset.sh
 FLASHER ?=
 FLASHFILE ?= $(ELFFILE)
 
-TERMFLAGS ?= -n $(FLASHFILE)
+ifeq (native,$(RIOT_TERMINAL))
+  TERMPROG ?= $(FLASHFILE)
+else
+  TERMFLAGS += -n $(FLASHFILE)
+endif
 
 export VALGRIND ?= valgrind
 export CGANNOTATE ?= cg_annotate

examples/gnrc_border_router/Makefile.native.conf

@@ -34,6 +34,7 @@ endif
 # Configure terminal parameters
 TERMDEPS += host-tools
 TERMPROG_FLAGS = $(FLAGS_EXTRAS) $(ELFFILE) $(IPV6_PREFIX)
+RIOT_TERMINAL ?= native
 TERMPROG ?= sudo $(RIOTTOOLS)/zep_dispatch/start_network.sh $(TERMPROG_FLAGS)
 
 # -z [::1]:$PORT for each ZEP device

makefiles/tools/serial.inc.mk

@@ -80,4 +80,6 @@ else ifeq (${RIOT_TERMINAL},bootterm)
   TERMPROG = $(RIOTTOOLS)/bootterm/bt
   TERMFLAGS = $(BOOTTERMFLAGS) -a -b $(BAUD) $(PORT)
   TERMDEPS += $(TERMPROG)
+else ifeq (${RIOT_TERMINAL},native)
+  TERMPROG ?= $(ELFFILE)
 endif

tests/core/sched_change_priority/Makefile

@@ -4,9 +4,6 @@ USEMODULE += nice
 USEMODULE += ps
 USEMODULE += shell_cmds_default
 
-# Use a terminal that does not introduce extra characters into the stream.
-RIOT_TERMINAL ?= socat
-
 APP_SHELL_FMT ?= NONE
 
 include $(RIOTBASE)/Makefile.include

tests/net/gcoap_dns/Makefile

@@ -28,6 +28,9 @@ CFLAGS += -DHAS_SOCK_DNS_MOCK=1
 include $(RIOTBASE)/Makefile.include
 
 ifeq (native,$(BOARD))
+RIOT_TERMINAL=native
+TERMPROG=$(ELFFILE)
+TERMFLAGS=
 test: PORT=
 $(call target-export-variables,test,PORT)
 endif