Merge #19585 #19586

19585: tests: move leftover sys related tests to test/sys + move tests/sys/candev to tests/drivers r=aabadie a=aabadie



19586: tests: move net related applications to test/net r=aabadie a=aabadie



Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>

makefiles/app_dirs.inc.mk

@@ -19,6 +19,7 @@ APPLICATION_DIRS :=                   \
     tests/core                        \
     tests/cpu                         \
     tests/drivers                     \
+    tests/net                         \
     tests/periph                      \
     tests/pkg                         \
     tests/sys                         \

tests/drivers/atwinc15x0/Makefile

@@ -5,4 +5,4 @@ USEMODULE = atwinc15x0
 FEATURES_BLACKLIST += arch_msp430 cpu_core_atxmega
 
 include ../Makefile.drivers_common
-include ../../netdev_common/Makefile.netdev.mk
+include ../../net/netdev_common/Makefile.netdev.mk

tests/drivers/atwinc15x0/main.c

@@ -1 +1 @@
-../../netdev_common/main.c
+../../net/netdev_common/main.c

tests/drivers/candev/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.sys_common
+include ../Makefile.drivers_common
 
 USEMODULE += shell
 USEMODULE += can

tests/drivers/kw2xrf/common.h

@@ -1 +1 @@
-../../ieee802154_hal/common.h
+../../net/ieee802154_hal/common.h

tests/drivers/kw2xrf/init_dev.c

@@ -1 +1 @@
-../../ieee802154_hal/init_devs.c
+../../net/ieee802154_hal/init_devs.c

tests/drivers/mrf24j40/common.h

@@ -1 +1 @@
-../../ieee802154_hal/common.h
+../../net/ieee802154_hal/common.h

tests/drivers/mrf24j40/init_dev.c

@@ -1 +1 @@
-../../ieee802154_hal/init_devs.c
+../../net/ieee802154_hal/init_devs.c

tests/drivers/nrf802154/Makefile

@@ -1,5 +1,5 @@
 INCLUDES += -I$(APPDIR)
-BOARD ?= nrf52dk
+BOARD ?= nrf52840dk
 
 include ../Makefile.drivers_common
 

tests/drivers/xbee/Makefile

@@ -3,4 +3,4 @@ USEMODULE += xbee
 # No need of big buffer for this test
 GNRC_PKTBUF_SIZE ?= 512
 include ../Makefile.drivers_common
-include ../../netdev_common/Makefile.netdev.mk
+include ../../net/netdev_common/Makefile.netdev.mk

tests/drivers/xbee/main.c

@@ -1 +1 @@
-../../netdev_common/main.c
+../../net/netdev_common/main.c

tests/net/Makefile.net_common

@@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common

tests/net/emcute/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 RIOTBASE ?= $(CURDIR)/../..
 

tests/net/gcoap_dns/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 USEMODULE += embunit
 

tests/net/gcoap_fileserver/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += auto_init_gnrc_rpl

tests/net/gcoap_fileserver/tests/01-run.py

@@ -6,6 +6,7 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 
+import os
 import subprocess
 import time
 
@@ -16,6 +17,8 @@ from riotctrl.ctrl import RIOTCtrlBoardFactory
 from riotctrl_ctrl import native
 from riotctrl_shell.netif import IfconfigListParser
 
+RIOTBASE = os.getenv("RIOTBASE", os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../")))
+ZEP_DISPATCH_PATH = os.path.join(RIOTBASE, "dist/tools/zep_dispatch/bin/zep_dispatch")
 PARSERS = {
     "ping6": GNRCICMPv6EchoParser(),
     "ifconfig": IfconfigListParser(),
@@ -120,8 +123,7 @@ def test_linear_topology(factory, zep_dispatch):
 
 
 def run_test(func, factory):
-    with Popen(['../../dist/tools/zep_dispatch/bin/zep_dispatch',
-                '-t', '-', '127.0.0.1', '17754'], stdin=subprocess.PIPE) as zep_dispatch:
+    with Popen([ZEP_DISPATCH_PATH, '-t', '-', '127.0.0.1', '17754'], stdin=subprocess.PIPE) as zep_dispatch:
         try:
             func(factory, zep_dispatch)
         finally:

tests/net/gnrc_dhcpv6_client/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 # generate random free port
 DHCPV6_SERVER_PORT := 61342

tests/net/gnrc_dhcpv6_client_6lbr/Makefile

@@ -1,5 +1,5 @@
 DEVELHELP := 1
-include $(CURDIR)/../Makefile.tests_common
+include ../Makefile.net_common
 
 export TAP ?= tap0
 

tests/net/gnrc_dhcpv6_client_stateless/Makefile

@@ -1,5 +1,5 @@
 DEVELHELP := 1
-include $(CURDIR)/../Makefile.tests_common
+include ../Makefile.net_common
 
 export TAP ?= tap0
 

tests/net/gnrc_dhcpv6_relay/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 RIOTBASE ?= $(CURDIR)/../..
 

tests/net/gnrc_gomach/Makefile

@@ -1,6 +1,6 @@
 # use samr21-xpro as default:
 BOARD ?= samr21-xpro
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 # Currently, GoMacH has only been tested and evaluated through on samr21-xpro and iotlab-m3
 # nodes. Once GoMacH has also been tested through on other devices, the whitelist should

tests/net/gnrc_ipv6_ext/Makefile

@@ -1,6 +1,6 @@
 DEVELHELP := 1
 # name of your application
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 export TAP ?= tap0
 

tests/net/gnrc_ipv6_ext_frag/Makefile

@@ -1,6 +1,6 @@
 DEVELHELP := 1
 # name of your application
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 export TAP ?= tap0
 

tests/net/gnrc_ipv6_ext_opt/Makefile

@@ -1,6 +1,6 @@
 DEVELHELP = 1
 # name of your application
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 export TAP ?= tap0
 

tests/net/gnrc_ipv6_fwd_w_sub/Makefile

@@ -1,5 +1,5 @@
 DEVELHELP := 1
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_netif

tests/net/gnrc_ipv6_nib/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 USEMODULE += gnrc_ipv6
 USEMODULE += gnrc_ipv6_nib

tests/net/gnrc_ipv6_nib_6ln/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.net_common
 
 USEMODULE += gnrc_ipv6
 USEMODULE += gnrc_sixlowpan