diff --git a/makefiles/app_dirs.inc.mk b/makefiles/app_dirs.inc.mk index 6659b2df1b..f71a021f19 100644 --- a/makefiles/app_dirs.inc.mk +++ b/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 \ diff --git a/tests/drivers/atwinc15x0/Makefile b/tests/drivers/atwinc15x0/Makefile index b86d18546e..b17a948a15 100644 --- a/tests/drivers/atwinc15x0/Makefile +++ b/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 diff --git a/tests/drivers/atwinc15x0/main.c b/tests/drivers/atwinc15x0/main.c index d75c14da72..e15e98267e 120000 --- a/tests/drivers/atwinc15x0/main.c +++ b/tests/drivers/atwinc15x0/main.c @@ -1 +1 @@ -../../netdev_common/main.c \ No newline at end of file +../../net/netdev_common/main.c \ No newline at end of file diff --git a/tests/sys/candev/Makefile b/tests/drivers/candev/Makefile similarity index 73% rename from tests/sys/candev/Makefile rename to tests/drivers/candev/Makefile index 1f55f7b9a3..84888ad9e0 100644 --- a/tests/sys/candev/Makefile +++ b/tests/drivers/candev/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.sys_common +include ../Makefile.drivers_common USEMODULE += shell USEMODULE += can diff --git a/tests/sys/candev/Makefile.board.dep b/tests/drivers/candev/Makefile.board.dep similarity index 100% rename from tests/sys/candev/Makefile.board.dep rename to tests/drivers/candev/Makefile.board.dep diff --git a/tests/sys/candev/Makefile.ci b/tests/drivers/candev/Makefile.ci similarity index 100% rename from tests/sys/candev/Makefile.ci rename to tests/drivers/candev/Makefile.ci diff --git a/tests/sys/candev/README.md b/tests/drivers/candev/README.md similarity index 100% rename from tests/sys/candev/README.md rename to tests/drivers/candev/README.md diff --git a/tests/sys/candev/README.native.can.md b/tests/drivers/candev/README.native.can.md similarity index 100% rename from tests/sys/candev/README.native.can.md rename to tests/drivers/candev/README.native.can.md diff --git a/tests/sys/candev/main.c b/tests/drivers/candev/main.c similarity index 100% rename from tests/sys/candev/main.c rename to tests/drivers/candev/main.c diff --git a/tests/drivers/kw2xrf/common.h b/tests/drivers/kw2xrf/common.h index 618a21b4fc..1954276290 120000 --- a/tests/drivers/kw2xrf/common.h +++ b/tests/drivers/kw2xrf/common.h @@ -1 +1 @@ -../../ieee802154_hal/common.h \ No newline at end of file +../../net/ieee802154_hal/common.h \ No newline at end of file diff --git a/tests/drivers/kw2xrf/init_dev.c b/tests/drivers/kw2xrf/init_dev.c index f4a4ab83e2..0d1305f75d 120000 --- a/tests/drivers/kw2xrf/init_dev.c +++ b/tests/drivers/kw2xrf/init_dev.c @@ -1 +1 @@ -../../ieee802154_hal/init_devs.c \ No newline at end of file +../../net/ieee802154_hal/init_devs.c \ No newline at end of file diff --git a/tests/drivers/mrf24j40/common.h b/tests/drivers/mrf24j40/common.h index 618a21b4fc..1954276290 120000 --- a/tests/drivers/mrf24j40/common.h +++ b/tests/drivers/mrf24j40/common.h @@ -1 +1 @@ -../../ieee802154_hal/common.h \ No newline at end of file +../../net/ieee802154_hal/common.h \ No newline at end of file diff --git a/tests/drivers/mrf24j40/init_dev.c b/tests/drivers/mrf24j40/init_dev.c index f4a4ab83e2..0d1305f75d 120000 --- a/tests/drivers/mrf24j40/init_dev.c +++ b/tests/drivers/mrf24j40/init_dev.c @@ -1 +1 @@ -../../ieee802154_hal/init_devs.c \ No newline at end of file +../../net/ieee802154_hal/init_devs.c \ No newline at end of file diff --git a/tests/drivers/nrf802154/Makefile b/tests/drivers/nrf802154/Makefile index 931988e079..15b51bf3f3 100644 --- a/tests/drivers/nrf802154/Makefile +++ b/tests/drivers/nrf802154/Makefile @@ -1,5 +1,5 @@ INCLUDES += -I$(APPDIR) -BOARD ?= nrf52dk +BOARD ?= nrf52840dk include ../Makefile.drivers_common diff --git a/tests/drivers/xbee/Makefile b/tests/drivers/xbee/Makefile index 43998f388d..df16174c28 100644 --- a/tests/drivers/xbee/Makefile +++ b/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 diff --git a/tests/drivers/xbee/main.c b/tests/drivers/xbee/main.c index d75c14da72..e15e98267e 120000 --- a/tests/drivers/xbee/main.c +++ b/tests/drivers/xbee/main.c @@ -1 +1 @@ -../../netdev_common/main.c \ No newline at end of file +../../net/netdev_common/main.c \ No newline at end of file diff --git a/tests/net/Makefile.net_common b/tests/net/Makefile.net_common new file mode 100644 index 0000000000..ecfb7b7d01 --- /dev/null +++ b/tests/net/Makefile.net_common @@ -0,0 +1,2 @@ +RIOTBASE ?= $(CURDIR)/../../.. +include $(CURDIR)/../../Makefile.tests_common diff --git a/tests/emcute/Makefile b/tests/net/emcute/Makefile similarity index 97% rename from tests/emcute/Makefile rename to tests/net/emcute/Makefile index e22fead280..441c524ae6 100644 --- a/tests/emcute/Makefile +++ b/tests/net/emcute/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common RIOTBASE ?= $(CURDIR)/../.. diff --git a/tests/emcute/Makefile.board.dep b/tests/net/emcute/Makefile.board.dep similarity index 100% rename from tests/emcute/Makefile.board.dep rename to tests/net/emcute/Makefile.board.dep diff --git a/tests/emcute/Makefile.ci b/tests/net/emcute/Makefile.ci similarity index 100% rename from tests/emcute/Makefile.ci rename to tests/net/emcute/Makefile.ci diff --git a/tests/emcute/README.md b/tests/net/emcute/README.md similarity index 100% rename from tests/emcute/README.md rename to tests/net/emcute/README.md diff --git a/tests/emcute/main.c b/tests/net/emcute/main.c similarity index 100% rename from tests/emcute/main.c rename to tests/net/emcute/main.c diff --git a/tests/emcute/tests-as-root/01-run.py b/tests/net/emcute/tests-as-root/01-run.py similarity index 100% rename from tests/emcute/tests-as-root/01-run.py rename to tests/net/emcute/tests-as-root/01-run.py diff --git a/tests/gcoap_dns/Makefile b/tests/net/gcoap_dns/Makefile similarity index 94% rename from tests/gcoap_dns/Makefile rename to tests/net/gcoap_dns/Makefile index 9a946c8bb9..e8484c1c7a 100644 --- a/tests/gcoap_dns/Makefile +++ b/tests/net/gcoap_dns/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += embunit diff --git a/tests/gcoap_dns/Makefile.ci b/tests/net/gcoap_dns/Makefile.ci similarity index 100% rename from tests/gcoap_dns/Makefile.ci rename to tests/net/gcoap_dns/Makefile.ci diff --git a/tests/gcoap_dns/app.config b/tests/net/gcoap_dns/app.config similarity index 100% rename from tests/gcoap_dns/app.config rename to tests/net/gcoap_dns/app.config diff --git a/tests/gcoap_dns/coaps.config b/tests/net/gcoap_dns/coaps.config similarity index 100% rename from tests/gcoap_dns/coaps.config rename to tests/net/gcoap_dns/coaps.config diff --git a/tests/gcoap_dns/main.c b/tests/net/gcoap_dns/main.c similarity index 100% rename from tests/gcoap_dns/main.c rename to tests/net/gcoap_dns/main.c diff --git a/tests/gcoap_dns/sock_dns_mock.c b/tests/net/gcoap_dns/sock_dns_mock.c similarity index 100% rename from tests/gcoap_dns/sock_dns_mock.c rename to tests/net/gcoap_dns/sock_dns_mock.c diff --git a/tests/gcoap_dns/tests/01-run.py b/tests/net/gcoap_dns/tests/01-run.py similarity index 100% rename from tests/gcoap_dns/tests/01-run.py rename to tests/net/gcoap_dns/tests/01-run.py diff --git a/tests/gcoap_fileserver/Makefile b/tests/net/gcoap_fileserver/Makefile similarity index 97% rename from tests/gcoap_fileserver/Makefile rename to tests/net/gcoap_fileserver/Makefile index 227ad19d3f..316747c572 100644 --- a/tests/gcoap_fileserver/Makefile +++ b/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 diff --git a/tests/gcoap_fileserver/Makefile.ci b/tests/net/gcoap_fileserver/Makefile.ci similarity index 100% rename from tests/gcoap_fileserver/Makefile.ci rename to tests/net/gcoap_fileserver/Makefile.ci diff --git a/tests/gcoap_fileserver/main.c b/tests/net/gcoap_fileserver/main.c similarity index 100% rename from tests/gcoap_fileserver/main.c rename to tests/net/gcoap_fileserver/main.c diff --git a/tests/gcoap_fileserver/tests/01-run.py b/tests/net/gcoap_fileserver/tests/01-run.py similarity index 92% rename from tests/gcoap_fileserver/tests/01-run.py rename to tests/net/gcoap_fileserver/tests/01-run.py index e07973cbd3..00190351d8 100755 --- a/tests/gcoap_fileserver/tests/01-run.py +++ b/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: diff --git a/tests/gnrc_dhcpv6_client/Makefile b/tests/net/gnrc_dhcpv6_client/Makefile similarity index 97% rename from tests/gnrc_dhcpv6_client/Makefile rename to tests/net/gnrc_dhcpv6_client/Makefile index b5a8144816..8be6020453 100644 --- a/tests/gnrc_dhcpv6_client/Makefile +++ b/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 diff --git a/tests/gnrc_dhcpv6_client/Makefile.board.dep b/tests/net/gnrc_dhcpv6_client/Makefile.board.dep similarity index 100% rename from tests/gnrc_dhcpv6_client/Makefile.board.dep rename to tests/net/gnrc_dhcpv6_client/Makefile.board.dep diff --git a/tests/gnrc_dhcpv6_client/Makefile.ci b/tests/net/gnrc_dhcpv6_client/Makefile.ci similarity index 100% rename from tests/gnrc_dhcpv6_client/Makefile.ci rename to tests/net/gnrc_dhcpv6_client/Makefile.ci diff --git a/tests/gnrc_dhcpv6_client/README.md b/tests/net/gnrc_dhcpv6_client/README.md similarity index 100% rename from tests/gnrc_dhcpv6_client/README.md rename to tests/net/gnrc_dhcpv6_client/README.md diff --git a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh b/tests/net/gnrc_dhcpv6_client/dhcpv6_server.sh similarity index 100% rename from tests/gnrc_dhcpv6_client/dhcpv6_server.sh rename to tests/net/gnrc_dhcpv6_client/dhcpv6_server.sh diff --git a/tests/gnrc_dhcpv6_client/kea-dhcp6.conf b/tests/net/gnrc_dhcpv6_client/kea-dhcp6.conf similarity index 100% rename from tests/gnrc_dhcpv6_client/kea-dhcp6.conf rename to tests/net/gnrc_dhcpv6_client/kea-dhcp6.conf diff --git a/tests/gnrc_dhcpv6_client/main.c b/tests/net/gnrc_dhcpv6_client/main.c similarity index 100% rename from tests/gnrc_dhcpv6_client/main.c rename to tests/net/gnrc_dhcpv6_client/main.c diff --git a/tests/gnrc_dhcpv6_client/tests-with-config/01-run.py b/tests/net/gnrc_dhcpv6_client/tests-with-config/01-run.py similarity index 100% rename from tests/gnrc_dhcpv6_client/tests-with-config/01-run.py rename to tests/net/gnrc_dhcpv6_client/tests-with-config/01-run.py diff --git a/tests/gnrc_dhcpv6_client/tests-with-config/check-config.sh b/tests/net/gnrc_dhcpv6_client/tests-with-config/check-config.sh similarity index 100% rename from tests/gnrc_dhcpv6_client/tests-with-config/check-config.sh rename to tests/net/gnrc_dhcpv6_client/tests-with-config/check-config.sh diff --git a/tests/gnrc_dhcpv6_client_6lbr/Kconfig b/tests/net/gnrc_dhcpv6_client_6lbr/Kconfig similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/Kconfig rename to tests/net/gnrc_dhcpv6_client_6lbr/Kconfig diff --git a/tests/gnrc_dhcpv6_client_6lbr/Makefile b/tests/net/gnrc_dhcpv6_client_6lbr/Makefile similarity index 96% rename from tests/gnrc_dhcpv6_client_6lbr/Makefile rename to tests/net/gnrc_dhcpv6_client_6lbr/Makefile index 68c47192f4..6fbf4da34f 100644 --- a/tests/gnrc_dhcpv6_client_6lbr/Makefile +++ b/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 diff --git a/tests/gnrc_dhcpv6_client_6lbr/Makefile.board.dep b/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.board.dep similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/Makefile.board.dep rename to tests/net/gnrc_dhcpv6_client_6lbr/Makefile.board.dep diff --git a/tests/gnrc_dhcpv6_client_6lbr/Makefile.ci b/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/Makefile.ci rename to tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci diff --git a/tests/gnrc_dhcpv6_client_6lbr/README.md b/tests/net/gnrc_dhcpv6_client_6lbr/README.md similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/README.md rename to tests/net/gnrc_dhcpv6_client_6lbr/README.md diff --git a/tests/gnrc_dhcpv6_client_6lbr/main.c b/tests/net/gnrc_dhcpv6_client_6lbr/main.c similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/main.c rename to tests/net/gnrc_dhcpv6_client_6lbr/main.c diff --git a/tests/gnrc_dhcpv6_client_6lbr/tests-as-root/01-run.py b/tests/net/gnrc_dhcpv6_client_6lbr/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_dhcpv6_client_6lbr/tests-as-root/01-run.py rename to tests/net/gnrc_dhcpv6_client_6lbr/tests-as-root/01-run.py diff --git a/tests/gnrc_dhcpv6_client_stateless/Makefile b/tests/net/gnrc_dhcpv6_client_stateless/Makefile similarity index 96% rename from tests/gnrc_dhcpv6_client_stateless/Makefile rename to tests/net/gnrc_dhcpv6_client_stateless/Makefile index f3c8304e77..7c92841c17 100644 --- a/tests/gnrc_dhcpv6_client_stateless/Makefile +++ b/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 diff --git a/tests/gnrc_dhcpv6_client_stateless/Makefile.board.dep b/tests/net/gnrc_dhcpv6_client_stateless/Makefile.board.dep similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/Makefile.board.dep rename to tests/net/gnrc_dhcpv6_client_stateless/Makefile.board.dep diff --git a/tests/gnrc_dhcpv6_client_stateless/Makefile.ci b/tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/Makefile.ci rename to tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci diff --git a/tests/gnrc_dhcpv6_client_stateless/README.md b/tests/net/gnrc_dhcpv6_client_stateless/README.md similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/README.md rename to tests/net/gnrc_dhcpv6_client_stateless/README.md diff --git a/tests/gnrc_dhcpv6_client_stateless/app.config b/tests/net/gnrc_dhcpv6_client_stateless/app.config similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/app.config rename to tests/net/gnrc_dhcpv6_client_stateless/app.config diff --git a/tests/gnrc_dhcpv6_client_stateless/main.c b/tests/net/gnrc_dhcpv6_client_stateless/main.c similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/main.c rename to tests/net/gnrc_dhcpv6_client_stateless/main.c diff --git a/tests/gnrc_dhcpv6_client_stateless/test-graph.svg b/tests/net/gnrc_dhcpv6_client_stateless/test-graph.svg similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/test-graph.svg rename to tests/net/gnrc_dhcpv6_client_stateless/test-graph.svg diff --git a/tests/gnrc_dhcpv6_client_stateless/tests-as-root/01-run.py b/tests/net/gnrc_dhcpv6_client_stateless/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_dhcpv6_client_stateless/tests-as-root/01-run.py rename to tests/net/gnrc_dhcpv6_client_stateless/tests-as-root/01-run.py diff --git a/tests/gnrc_dhcpv6_relay/Makefile b/tests/net/gnrc_dhcpv6_relay/Makefile similarity index 97% rename from tests/gnrc_dhcpv6_relay/Makefile rename to tests/net/gnrc_dhcpv6_relay/Makefile index efab4e650b..66334905a0 100644 --- a/tests/gnrc_dhcpv6_relay/Makefile +++ b/tests/net/gnrc_dhcpv6_relay/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common RIOTBASE ?= $(CURDIR)/../.. diff --git a/tests/gnrc_dhcpv6_relay/Makefile.board.dep b/tests/net/gnrc_dhcpv6_relay/Makefile.board.dep similarity index 100% rename from tests/gnrc_dhcpv6_relay/Makefile.board.dep rename to tests/net/gnrc_dhcpv6_relay/Makefile.board.dep diff --git a/tests/gnrc_dhcpv6_relay/Makefile.ci b/tests/net/gnrc_dhcpv6_relay/Makefile.ci similarity index 100% rename from tests/gnrc_dhcpv6_relay/Makefile.ci rename to tests/net/gnrc_dhcpv6_relay/Makefile.ci diff --git a/tests/gnrc_dhcpv6_relay/main.c b/tests/net/gnrc_dhcpv6_relay/main.c similarity index 100% rename from tests/gnrc_dhcpv6_relay/main.c rename to tests/net/gnrc_dhcpv6_relay/main.c diff --git a/tests/gnrc_dhcpv6_relay/tests-as-root/01-run.py b/tests/net/gnrc_dhcpv6_relay/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_dhcpv6_relay/tests-as-root/01-run.py rename to tests/net/gnrc_dhcpv6_relay/tests-as-root/01-run.py diff --git a/tests/gnrc_gomach/Makefile b/tests/net/gnrc_gomach/Makefile similarity index 97% rename from tests/gnrc_gomach/Makefile rename to tests/net/gnrc_gomach/Makefile index 26adca1493..86a3765a80 100644 --- a/tests/gnrc_gomach/Makefile +++ b/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 diff --git a/tests/gnrc_gomach/README.md b/tests/net/gnrc_gomach/README.md similarity index 100% rename from tests/gnrc_gomach/README.md rename to tests/net/gnrc_gomach/README.md diff --git a/tests/gnrc_gomach/main.c b/tests/net/gnrc_gomach/main.c similarity index 100% rename from tests/gnrc_gomach/main.c rename to tests/net/gnrc_gomach/main.c diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/net/gnrc_ipv6_ext/Makefile similarity index 96% rename from tests/gnrc_ipv6_ext/Makefile rename to tests/net/gnrc_ipv6_ext/Makefile index 0dd6223178..9e802876cf 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_ext/Makefile.board.dep b/tests/net/gnrc_ipv6_ext/Makefile.board.dep similarity index 100% rename from tests/gnrc_ipv6_ext/Makefile.board.dep rename to tests/net/gnrc_ipv6_ext/Makefile.board.dep diff --git a/tests/gnrc_ipv6_ext/Makefile.ci b/tests/net/gnrc_ipv6_ext/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_ext/Makefile.ci rename to tests/net/gnrc_ipv6_ext/Makefile.ci diff --git a/tests/gnrc_ipv6_ext/README.md b/tests/net/gnrc_ipv6_ext/README.md similarity index 100% rename from tests/gnrc_ipv6_ext/README.md rename to tests/net/gnrc_ipv6_ext/README.md diff --git a/tests/gnrc_ipv6_ext/main.c b/tests/net/gnrc_ipv6_ext/main.c similarity index 100% rename from tests/gnrc_ipv6_ext/main.c rename to tests/net/gnrc_ipv6_ext/main.c diff --git a/tests/gnrc_ipv6_ext/tests-as-root/01-run.py b/tests/net/gnrc_ipv6_ext/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_ipv6_ext/tests-as-root/01-run.py rename to tests/net/gnrc_ipv6_ext/tests-as-root/01-run.py diff --git a/tests/gnrc_ipv6_ext_frag/Makefile b/tests/net/gnrc_ipv6_ext_frag/Makefile similarity index 97% rename from tests/gnrc_ipv6_ext_frag/Makefile rename to tests/net/gnrc_ipv6_ext_frag/Makefile index c5d2deab51..771ab061c5 100644 --- a/tests/gnrc_ipv6_ext_frag/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_ext_frag/Makefile.board.dep b/tests/net/gnrc_ipv6_ext_frag/Makefile.board.dep similarity index 100% rename from tests/gnrc_ipv6_ext_frag/Makefile.board.dep rename to tests/net/gnrc_ipv6_ext_frag/Makefile.board.dep diff --git a/tests/gnrc_ipv6_ext_frag/Makefile.ci b/tests/net/gnrc_ipv6_ext_frag/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_ext_frag/Makefile.ci rename to tests/net/gnrc_ipv6_ext_frag/Makefile.ci diff --git a/tests/gnrc_ipv6_ext_frag/README.md b/tests/net/gnrc_ipv6_ext_frag/README.md similarity index 100% rename from tests/gnrc_ipv6_ext_frag/README.md rename to tests/net/gnrc_ipv6_ext_frag/README.md diff --git a/tests/gnrc_ipv6_ext_frag/app.config b/tests/net/gnrc_ipv6_ext_frag/app.config similarity index 100% rename from tests/gnrc_ipv6_ext_frag/app.config rename to tests/net/gnrc_ipv6_ext_frag/app.config diff --git a/tests/gnrc_ipv6_ext_frag/main.c b/tests/net/gnrc_ipv6_ext_frag/main.c similarity index 100% rename from tests/gnrc_ipv6_ext_frag/main.c rename to tests/net/gnrc_ipv6_ext_frag/main.c diff --git a/tests/gnrc_ipv6_ext_frag/tests-as-root/01-run.py b/tests/net/gnrc_ipv6_ext_frag/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_ipv6_ext_frag/tests-as-root/01-run.py rename to tests/net/gnrc_ipv6_ext_frag/tests-as-root/01-run.py diff --git a/tests/gnrc_ipv6_ext_frag/udp.c b/tests/net/gnrc_ipv6_ext_frag/udp.c similarity index 100% rename from tests/gnrc_ipv6_ext_frag/udp.c rename to tests/net/gnrc_ipv6_ext_frag/udp.c diff --git a/tests/gnrc_ipv6_ext_opt/Makefile b/tests/net/gnrc_ipv6_ext_opt/Makefile similarity index 96% rename from tests/gnrc_ipv6_ext_opt/Makefile rename to tests/net/gnrc_ipv6_ext_opt/Makefile index f789a3f79c..af95d8bbf3 100644 --- a/tests/gnrc_ipv6_ext_opt/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_ext_opt/Makefile.board.dep b/tests/net/gnrc_ipv6_ext_opt/Makefile.board.dep similarity index 100% rename from tests/gnrc_ipv6_ext_opt/Makefile.board.dep rename to tests/net/gnrc_ipv6_ext_opt/Makefile.board.dep diff --git a/tests/gnrc_ipv6_ext_opt/Makefile.ci b/tests/net/gnrc_ipv6_ext_opt/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_ext_opt/Makefile.ci rename to tests/net/gnrc_ipv6_ext_opt/Makefile.ci diff --git a/tests/gnrc_ipv6_ext_opt/README.md b/tests/net/gnrc_ipv6_ext_opt/README.md similarity index 100% rename from tests/gnrc_ipv6_ext_opt/README.md rename to tests/net/gnrc_ipv6_ext_opt/README.md diff --git a/tests/gnrc_ipv6_ext_opt/main.c b/tests/net/gnrc_ipv6_ext_opt/main.c similarity index 100% rename from tests/gnrc_ipv6_ext_opt/main.c rename to tests/net/gnrc_ipv6_ext_opt/main.c diff --git a/tests/gnrc_ipv6_ext_opt/tests-as-root/01-run.py b/tests/net/gnrc_ipv6_ext_opt/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_ipv6_ext_opt/tests-as-root/01-run.py rename to tests/net/gnrc_ipv6_ext_opt/tests-as-root/01-run.py diff --git a/tests/gnrc_ipv6_fwd_w_sub/Makefile b/tests/net/gnrc_ipv6_fwd_w_sub/Makefile similarity index 94% rename from tests/gnrc_ipv6_fwd_w_sub/Makefile rename to tests/net/gnrc_ipv6_fwd_w_sub/Makefile index e57f3ff0dd..4509d7a700 100644 --- a/tests/gnrc_ipv6_fwd_w_sub/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_fwd_w_sub/Makefile.ci b/tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/Makefile.ci rename to tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci diff --git a/tests/gnrc_ipv6_fwd_w_sub/README.md b/tests/net/gnrc_ipv6_fwd_w_sub/README.md similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/README.md rename to tests/net/gnrc_ipv6_fwd_w_sub/README.md diff --git a/tests/gnrc_ipv6_fwd_w_sub/common.h b/tests/net/gnrc_ipv6_fwd_w_sub/common.h similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/common.h rename to tests/net/gnrc_ipv6_fwd_w_sub/common.h diff --git a/tests/gnrc_ipv6_fwd_w_sub/main.c b/tests/net/gnrc_ipv6_fwd_w_sub/main.c similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/main.c rename to tests/net/gnrc_ipv6_fwd_w_sub/main.c diff --git a/tests/gnrc_ipv6_fwd_w_sub/mockup_netif.c b/tests/net/gnrc_ipv6_fwd_w_sub/mockup_netif.c similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/mockup_netif.c rename to tests/net/gnrc_ipv6_fwd_w_sub/mockup_netif.c diff --git a/tests/gnrc_ipv6_fwd_w_sub/tests/01-run.py b/tests/net/gnrc_ipv6_fwd_w_sub/tests/01-run.py similarity index 100% rename from tests/gnrc_ipv6_fwd_w_sub/tests/01-run.py rename to tests/net/gnrc_ipv6_fwd_w_sub/tests/01-run.py diff --git a/tests/gnrc_ipv6_nib/Makefile b/tests/net/gnrc_ipv6_nib/Makefile similarity index 92% rename from tests/gnrc_ipv6_nib/Makefile rename to tests/net/gnrc_ipv6_nib/Makefile index bc0a11f718..75c9896148 100644 --- a/tests/gnrc_ipv6_nib/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_nib/Makefile.ci b/tests/net/gnrc_ipv6_nib/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_nib/Makefile.ci rename to tests/net/gnrc_ipv6_nib/Makefile.ci diff --git a/tests/gnrc_ipv6_nib/common.h b/tests/net/gnrc_ipv6_nib/common.h similarity index 100% rename from tests/gnrc_ipv6_nib/common.h rename to tests/net/gnrc_ipv6_nib/common.h diff --git a/tests/gnrc_ipv6_nib/main.c b/tests/net/gnrc_ipv6_nib/main.c similarity index 100% rename from tests/gnrc_ipv6_nib/main.c rename to tests/net/gnrc_ipv6_nib/main.c diff --git a/tests/gnrc_ipv6_nib/mockup_netif.c b/tests/net/gnrc_ipv6_nib/mockup_netif.c similarity index 100% rename from tests/gnrc_ipv6_nib/mockup_netif.c rename to tests/net/gnrc_ipv6_nib/mockup_netif.c diff --git a/tests/gnrc_ipv6_nib/tests/01-run.py b/tests/net/gnrc_ipv6_nib/tests/01-run.py similarity index 100% rename from tests/gnrc_ipv6_nib/tests/01-run.py rename to tests/net/gnrc_ipv6_nib/tests/01-run.py diff --git a/tests/gnrc_ipv6_nib_6ln/Makefile b/tests/net/gnrc_ipv6_nib_6ln/Makefile similarity index 94% rename from tests/gnrc_ipv6_nib_6ln/Makefile rename to tests/net/gnrc_ipv6_nib_6ln/Makefile index 3a0582d558..0e0fdb3e85 100644 --- a/tests/gnrc_ipv6_nib_6ln/Makefile +++ b/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 diff --git a/tests/gnrc_ipv6_nib_6ln/Makefile.ci b/tests/net/gnrc_ipv6_nib_6ln/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_nib_6ln/Makefile.ci rename to tests/net/gnrc_ipv6_nib_6ln/Makefile.ci diff --git a/tests/gnrc_ipv6_nib_6ln/common.h b/tests/net/gnrc_ipv6_nib_6ln/common.h similarity index 100% rename from tests/gnrc_ipv6_nib_6ln/common.h rename to tests/net/gnrc_ipv6_nib_6ln/common.h diff --git a/tests/gnrc_ipv6_nib_6ln/main.c b/tests/net/gnrc_ipv6_nib_6ln/main.c similarity index 100% rename from tests/gnrc_ipv6_nib_6ln/main.c rename to tests/net/gnrc_ipv6_nib_6ln/main.c diff --git a/tests/gnrc_ipv6_nib_6ln/mockup_netif.c b/tests/net/gnrc_ipv6_nib_6ln/mockup_netif.c similarity index 100% rename from tests/gnrc_ipv6_nib_6ln/mockup_netif.c rename to tests/net/gnrc_ipv6_nib_6ln/mockup_netif.c diff --git a/tests/gnrc_ipv6_nib_6ln/tests/01-run.py b/tests/net/gnrc_ipv6_nib_6ln/tests/01-run.py similarity index 100% rename from tests/gnrc_ipv6_nib_6ln/tests/01-run.py rename to tests/net/gnrc_ipv6_nib_6ln/tests/01-run.py diff --git a/tests/gnrc_ipv6_nib_dns/Makefile b/tests/net/gnrc_ipv6_nib_dns/Makefile similarity index 97% rename from tests/gnrc_ipv6_nib_dns/Makefile rename to tests/net/gnrc_ipv6_nib_dns/Makefile index 7d4225c734..172e3cefb6 100644 --- a/tests/gnrc_ipv6_nib_dns/Makefile +++ b/tests/net/gnrc_ipv6_nib_dns/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common RIOTBASE ?= $(CURDIR)/../.. diff --git a/tests/gnrc_ipv6_nib_dns/Makefile.board.dep b/tests/net/gnrc_ipv6_nib_dns/Makefile.board.dep similarity index 100% rename from tests/gnrc_ipv6_nib_dns/Makefile.board.dep rename to tests/net/gnrc_ipv6_nib_dns/Makefile.board.dep diff --git a/tests/gnrc_ipv6_nib_dns/Makefile.ci b/tests/net/gnrc_ipv6_nib_dns/Makefile.ci similarity index 100% rename from tests/gnrc_ipv6_nib_dns/Makefile.ci rename to tests/net/gnrc_ipv6_nib_dns/Makefile.ci diff --git a/tests/gnrc_ipv6_nib_dns/README.md b/tests/net/gnrc_ipv6_nib_dns/README.md similarity index 100% rename from tests/gnrc_ipv6_nib_dns/README.md rename to tests/net/gnrc_ipv6_nib_dns/README.md diff --git a/tests/gnrc_ipv6_nib_dns/main.c b/tests/net/gnrc_ipv6_nib_dns/main.c similarity index 100% rename from tests/gnrc_ipv6_nib_dns/main.c rename to tests/net/gnrc_ipv6_nib_dns/main.c diff --git a/tests/gnrc_ipv6_nib_dns/tests-as-root/01-run.py b/tests/net/gnrc_ipv6_nib_dns/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_ipv6_nib_dns/tests-as-root/01-run.py rename to tests/net/gnrc_ipv6_nib_dns/tests-as-root/01-run.py diff --git a/tests/gnrc_lorawan/Makefile b/tests/net/gnrc_lorawan/Makefile similarity index 83% rename from tests/gnrc_lorawan/Makefile rename to tests/net/gnrc_lorawan/Makefile index 9532a2510e..bbe29359e3 100644 --- a/tests/gnrc_lorawan/Makefile +++ b/tests/net/gnrc_lorawan/Makefile @@ -1,5 +1,5 @@ # name of your application -include ../Makefile.tests_common +include ../Makefile.net_common CFLAGS += -DOUTPUT=TEXT diff --git a/tests/gnrc_lorawan/Makefile.ci b/tests/net/gnrc_lorawan/Makefile.ci similarity index 100% rename from tests/gnrc_lorawan/Makefile.ci rename to tests/net/gnrc_lorawan/Makefile.ci diff --git a/tests/gnrc_lorawan/main.c b/tests/net/gnrc_lorawan/main.c similarity index 100% rename from tests/gnrc_lorawan/main.c rename to tests/net/gnrc_lorawan/main.c diff --git a/tests/gnrc_lorawan/tests/01-run.py b/tests/net/gnrc_lorawan/tests/01-run.py similarity index 100% rename from tests/gnrc_lorawan/tests/01-run.py rename to tests/net/gnrc_lorawan/tests/01-run.py diff --git a/tests/gnrc_lorawan_11/Makefile b/tests/net/gnrc_lorawan_11/Makefile similarity index 83% rename from tests/gnrc_lorawan_11/Makefile rename to tests/net/gnrc_lorawan_11/Makefile index 2ffb044e35..4aaf886cd9 100644 --- a/tests/gnrc_lorawan_11/Makefile +++ b/tests/net/gnrc_lorawan_11/Makefile @@ -1,5 +1,5 @@ # name of your application -include ../Makefile.tests_common +include ../Makefile.net_common CFLAGS += -DOUTPUT=TEXT diff --git a/tests/gnrc_lorawan_11/Makefile.ci b/tests/net/gnrc_lorawan_11/Makefile.ci similarity index 100% rename from tests/gnrc_lorawan_11/Makefile.ci rename to tests/net/gnrc_lorawan_11/Makefile.ci diff --git a/tests/gnrc_lorawan_11/main.c b/tests/net/gnrc_lorawan_11/main.c similarity index 100% rename from tests/gnrc_lorawan_11/main.c rename to tests/net/gnrc_lorawan_11/main.c diff --git a/tests/gnrc_lorawan_11/tests/01-run.py b/tests/net/gnrc_lorawan_11/tests/01-run.py similarity index 100% rename from tests/gnrc_lorawan_11/tests/01-run.py rename to tests/net/gnrc_lorawan_11/tests/01-run.py diff --git a/tests/gnrc_lwmac/Makefile b/tests/net/gnrc_lwmac/Makefile similarity index 97% rename from tests/gnrc_lwmac/Makefile rename to tests/net/gnrc_lwmac/Makefile index 37e8db3c91..b97e1268a8 100644 --- a/tests/gnrc_lwmac/Makefile +++ b/tests/net/gnrc_lwmac/Makefile @@ -1,6 +1,6 @@ # use samr21-xpro as default: BOARD ?= samr21-xpro -include ../Makefile.tests_common +include ../Makefile.net_common # Currently, LWMAC is only tested and evaluated through on samr21-xpro. # Once LWMAC has also been tested through on other boards, the whitelist should diff --git a/tests/gnrc_lwmac/README.md b/tests/net/gnrc_lwmac/README.md similarity index 100% rename from tests/gnrc_lwmac/README.md rename to tests/net/gnrc_lwmac/README.md diff --git a/tests/gnrc_lwmac/main.c b/tests/net/gnrc_lwmac/main.c similarity index 100% rename from tests/gnrc_lwmac/main.c rename to tests/net/gnrc_lwmac/main.c diff --git a/tests/gnrc_mac_timeout/Makefile b/tests/net/gnrc_mac_timeout/Makefile similarity index 64% rename from tests/gnrc_mac_timeout/Makefile rename to tests/net/gnrc_mac_timeout/Makefile index 557632cb81..6a78094e52 100644 --- a/tests/gnrc_mac_timeout/Makefile +++ b/tests/net/gnrc_mac_timeout/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_mac diff --git a/tests/gnrc_mac_timeout/Makefile.ci b/tests/net/gnrc_mac_timeout/Makefile.ci similarity index 100% rename from tests/gnrc_mac_timeout/Makefile.ci rename to tests/net/gnrc_mac_timeout/Makefile.ci diff --git a/tests/gnrc_mac_timeout/README.md b/tests/net/gnrc_mac_timeout/README.md similarity index 100% rename from tests/gnrc_mac_timeout/README.md rename to tests/net/gnrc_mac_timeout/README.md diff --git a/tests/gnrc_mac_timeout/main.c b/tests/net/gnrc_mac_timeout/main.c similarity index 100% rename from tests/gnrc_mac_timeout/main.c rename to tests/net/gnrc_mac_timeout/main.c diff --git a/tests/gnrc_ndp/Makefile b/tests/net/gnrc_ndp/Makefile similarity index 93% rename from tests/gnrc_ndp/Makefile rename to tests/net/gnrc_ndp/Makefile index 835da6d9ca..f78bdd8b3d 100644 --- a/tests/gnrc_ndp/Makefile +++ b/tests/net/gnrc_ndp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_ipv6_nib_router USEMODULE += gnrc_ndp diff --git a/tests/gnrc_ndp/Makefile.ci b/tests/net/gnrc_ndp/Makefile.ci similarity index 100% rename from tests/gnrc_ndp/Makefile.ci rename to tests/net/gnrc_ndp/Makefile.ci diff --git a/tests/gnrc_ndp/main.c b/tests/net/gnrc_ndp/main.c similarity index 100% rename from tests/gnrc_ndp/main.c rename to tests/net/gnrc_ndp/main.c diff --git a/tests/gnrc_ndp/tests/01-run.py b/tests/net/gnrc_ndp/tests/01-run.py similarity index 100% rename from tests/gnrc_ndp/tests/01-run.py rename to tests/net/gnrc_ndp/tests/01-run.py diff --git a/tests/gnrc_netif/Makefile b/tests/net/gnrc_netif/Makefile similarity index 94% rename from tests/gnrc_netif/Makefile rename to tests/net/gnrc_netif/Makefile index 2e91ce872a..537b906a9c 100644 --- a/tests/gnrc_netif/Makefile +++ b/tests/net/gnrc_netif/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += embunit USEMODULE += gnrc_netif diff --git a/tests/gnrc_netif/Makefile.ci b/tests/net/gnrc_netif/Makefile.ci similarity index 100% rename from tests/gnrc_netif/Makefile.ci rename to tests/net/gnrc_netif/Makefile.ci diff --git a/tests/gnrc_netif/common.c b/tests/net/gnrc_netif/common.c similarity index 100% rename from tests/gnrc_netif/common.c rename to tests/net/gnrc_netif/common.c diff --git a/tests/gnrc_netif/common.h b/tests/net/gnrc_netif/common.h similarity index 100% rename from tests/gnrc_netif/common.h rename to tests/net/gnrc_netif/common.h diff --git a/tests/gnrc_netif/main.c b/tests/net/gnrc_netif/main.c similarity index 100% rename from tests/gnrc_netif/main.c rename to tests/net/gnrc_netif/main.c diff --git a/tests/gnrc_netif/tests/01-run.py b/tests/net/gnrc_netif/tests/01-run.py similarity index 100% rename from tests/gnrc_netif/tests/01-run.py rename to tests/net/gnrc_netif/tests/01-run.py diff --git a/tests/gnrc_netif_ieee802154/Makefile b/tests/net/gnrc_netif_ieee802154/Makefile similarity index 92% rename from tests/gnrc_netif_ieee802154/Makefile rename to tests/net/gnrc_netif_ieee802154/Makefile index 79d5189ee0..1e48d6a9a7 100644 --- a/tests/gnrc_netif_ieee802154/Makefile +++ b/tests/net/gnrc_netif_ieee802154/Makefile @@ -1,6 +1,6 @@ BOARD_WHITELIST = native -include ../Makefile.tests_common +include ../Makefile.net_common TERMFLAGS ?= -z "0.0.0.0:17755,localhost:17754" diff --git a/tests/gnrc_netif_ieee802154/README.md b/tests/net/gnrc_netif_ieee802154/README.md similarity index 100% rename from tests/gnrc_netif_ieee802154/README.md rename to tests/net/gnrc_netif_ieee802154/README.md diff --git a/tests/gnrc_netif_ieee802154/main.c b/tests/net/gnrc_netif_ieee802154/main.c similarity index 100% rename from tests/gnrc_netif_ieee802154/main.c rename to tests/net/gnrc_netif_ieee802154/main.c diff --git a/tests/gnrc_netif_ieee802154/tests/01-run.py b/tests/net/gnrc_netif_ieee802154/tests/01-run.py similarity index 100% rename from tests/gnrc_netif_ieee802154/tests/01-run.py rename to tests/net/gnrc_netif_ieee802154/tests/01-run.py diff --git a/tests/gnrc_netif_ipv6_wait_for_global_address/Makefile b/tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile similarity index 94% rename from tests/gnrc_netif_ipv6_wait_for_global_address/Makefile rename to tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile index 2c7bcba6c3..5eaf46b3a4 100644 --- a/tests/gnrc_netif_ipv6_wait_for_global_address/Makefile +++ b/tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += embunit USEMODULE += gnrc_netif diff --git a/tests/gnrc_netif_ipv6_wait_for_global_address/Makefile.ci b/tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile.ci similarity index 100% rename from tests/gnrc_netif_ipv6_wait_for_global_address/Makefile.ci rename to tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile.ci diff --git a/tests/gnrc_netif_ipv6_wait_for_global_address/main.c b/tests/net/gnrc_netif_ipv6_wait_for_global_address/main.c similarity index 100% rename from tests/gnrc_netif_ipv6_wait_for_global_address/main.c rename to tests/net/gnrc_netif_ipv6_wait_for_global_address/main.c diff --git a/tests/gnrc_netif_ipv6_wait_for_global_address/tests/01-run.py b/tests/net/gnrc_netif_ipv6_wait_for_global_address/tests/01-run.py similarity index 100% rename from tests/gnrc_netif_ipv6_wait_for_global_address/tests/01-run.py rename to tests/net/gnrc_netif_ipv6_wait_for_global_address/tests/01-run.py diff --git a/tests/gnrc_rpl/Makefile b/tests/net/gnrc_rpl/Makefile similarity index 95% rename from tests/gnrc_rpl/Makefile rename to tests/net/gnrc_rpl/Makefile index 22655d929d..b4777025a7 100644 --- a/tests/gnrc_rpl/Makefile +++ b/tests/net/gnrc_rpl/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_rpl diff --git a/tests/gnrc_rpl/Makefile.ci b/tests/net/gnrc_rpl/Makefile.ci similarity index 100% rename from tests/gnrc_rpl/Makefile.ci rename to tests/net/gnrc_rpl/Makefile.ci diff --git a/tests/gnrc_rpl/main.c b/tests/net/gnrc_rpl/main.c similarity index 100% rename from tests/gnrc_rpl/main.c rename to tests/net/gnrc_rpl/main.c diff --git a/tests/gnrc_rpl/tests/01-run.py b/tests/net/gnrc_rpl/tests/01-run.py similarity index 93% rename from tests/gnrc_rpl/tests/01-run.py rename to tests/net/gnrc_rpl/tests/01-run.py index 9610f7ed84..84d6741866 100755 --- a/tests/gnrc_rpl/tests/01-run.py +++ b/tests/net/gnrc_rpl/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(), @@ -162,8 +165,7 @@ def test_alternative_route(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: diff --git a/tests/gnrc_rpl_p2p/Makefile b/tests/net/gnrc_rpl_p2p/Makefile similarity index 80% rename from tests/gnrc_rpl_p2p/Makefile rename to tests/net/gnrc_rpl_p2p/Makefile index 6e3db2980a..8f3dd99f35 100644 --- a/tests/gnrc_rpl_p2p/Makefile +++ b/tests/net/gnrc_rpl_p2p/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_ipv6_router_default USEMODULE += auto_init_gnrc_rpl diff --git a/tests/gnrc_rpl_p2p/Makefile.ci b/tests/net/gnrc_rpl_p2p/Makefile.ci similarity index 100% rename from tests/gnrc_rpl_p2p/Makefile.ci rename to tests/net/gnrc_rpl_p2p/Makefile.ci diff --git a/tests/gnrc_rpl_p2p/main.c b/tests/net/gnrc_rpl_p2p/main.c similarity index 100% rename from tests/gnrc_rpl_p2p/main.c rename to tests/net/gnrc_rpl_p2p/main.c diff --git a/tests/gnrc_rpl_p2p/tests/01-run.py b/tests/net/gnrc_rpl_p2p/tests/01-run.py similarity index 100% rename from tests/gnrc_rpl_p2p/tests/01-run.py rename to tests/net/gnrc_rpl_p2p/tests/01-run.py diff --git a/tests/gnrc_rpl_srh/Makefile b/tests/net/gnrc_rpl_srh/Makefile similarity index 96% rename from tests/gnrc_rpl_srh/Makefile rename to tests/net/gnrc_rpl_srh/Makefile index 9df428b537..8222db51c2 100644 --- a/tests/gnrc_rpl_srh/Makefile +++ b/tests/net/gnrc_rpl_srh/Makefile @@ -1,6 +1,6 @@ DEVELHELP := 1 # name of your application -include ../Makefile.tests_common +include ../Makefile.net_common export TAP ?= tap0 diff --git a/tests/gnrc_rpl_srh/Makefile.board.dep b/tests/net/gnrc_rpl_srh/Makefile.board.dep similarity index 100% rename from tests/gnrc_rpl_srh/Makefile.board.dep rename to tests/net/gnrc_rpl_srh/Makefile.board.dep diff --git a/tests/gnrc_rpl_srh/Makefile.ci b/tests/net/gnrc_rpl_srh/Makefile.ci similarity index 100% rename from tests/gnrc_rpl_srh/Makefile.ci rename to tests/net/gnrc_rpl_srh/Makefile.ci diff --git a/tests/gnrc_rpl_srh/README.md b/tests/net/gnrc_rpl_srh/README.md similarity index 100% rename from tests/gnrc_rpl_srh/README.md rename to tests/net/gnrc_rpl_srh/README.md diff --git a/tests/gnrc_rpl_srh/main.c b/tests/net/gnrc_rpl_srh/main.c similarity index 100% rename from tests/gnrc_rpl_srh/main.c rename to tests/net/gnrc_rpl_srh/main.c diff --git a/tests/gnrc_rpl_srh/tests-as-root/01-run.py b/tests/net/gnrc_rpl_srh/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_rpl_srh/tests-as-root/01-run.py rename to tests/net/gnrc_rpl_srh/tests-as-root/01-run.py diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/net/gnrc_sixlowpan/Makefile similarity index 91% rename from tests/gnrc_sixlowpan/Makefile rename to tests/net/gnrc_sixlowpan/Makefile index 5fc888d8df..6101366cc7 100644 --- a/tests/gnrc_sixlowpan/Makefile +++ b/tests/net/gnrc_sixlowpan/Makefile @@ -1,5 +1,5 @@ # name of your application -include ../Makefile.tests_common +include ../Makefile.net_common # use IEEE 802.15.4 as link-layer protocol USEMODULE += netdev_ieee802154 diff --git a/tests/gnrc_sixlowpan/Makefile.ci b/tests/net/gnrc_sixlowpan/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan/Makefile.ci rename to tests/net/gnrc_sixlowpan/Makefile.ci diff --git a/tests/gnrc_sixlowpan/main.c b/tests/net/gnrc_sixlowpan/main.c similarity index 100% rename from tests/gnrc_sixlowpan/main.c rename to tests/net/gnrc_sixlowpan/main.c diff --git a/tests/gnrc_sixlowpan/tests/01-run.py b/tests/net/gnrc_sixlowpan/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan/tests/01-run.py rename to tests/net/gnrc_sixlowpan/tests/01-run.py diff --git a/tests/gnrc_sixlowpan_frag/Makefile b/tests/net/gnrc_sixlowpan_frag/Makefile similarity index 92% rename from tests/gnrc_sixlowpan_frag/Makefile rename to tests/net/gnrc_sixlowpan_frag/Makefile index 029c7b30d4..a672081b0a 100644 --- a/tests/gnrc_sixlowpan_frag/Makefile +++ b/tests/net/gnrc_sixlowpan_frag/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_sixlowpan_frag USEMODULE += embunit diff --git a/tests/gnrc_sixlowpan_frag/Makefile.ci b/tests/net/gnrc_sixlowpan_frag/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_frag/Makefile.ci rename to tests/net/gnrc_sixlowpan_frag/Makefile.ci diff --git a/tests/gnrc_sixlowpan_frag/main.c b/tests/net/gnrc_sixlowpan_frag/main.c similarity index 100% rename from tests/gnrc_sixlowpan_frag/main.c rename to tests/net/gnrc_sixlowpan_frag/main.c diff --git a/tests/gnrc_sixlowpan_frag/tests/01-run.py b/tests/net/gnrc_sixlowpan_frag/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan_frag/tests/01-run.py rename to tests/net/gnrc_sixlowpan_frag/tests/01-run.py diff --git a/tests/gnrc_sixlowpan_frag_minfwd/Makefile b/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile similarity index 93% rename from tests/gnrc_sixlowpan_frag_minfwd/Makefile rename to tests/net/gnrc_sixlowpan_frag_minfwd/Makefile index f2e7fa3f7a..961e8c010a 100644 --- a/tests/gnrc_sixlowpan_frag_minfwd/Makefile +++ b/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_sixlowpan_frag_minfwd diff --git a/tests/gnrc_sixlowpan_frag_minfwd/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/Makefile.ci rename to tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci diff --git a/tests/gnrc_sixlowpan_frag_minfwd/app.config b/tests/net/gnrc_sixlowpan_frag_minfwd/app.config similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/app.config rename to tests/net/gnrc_sixlowpan_frag_minfwd/app.config diff --git a/tests/gnrc_sixlowpan_frag_minfwd/common.h b/tests/net/gnrc_sixlowpan_frag_minfwd/common.h similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/common.h rename to tests/net/gnrc_sixlowpan_frag_minfwd/common.h diff --git a/tests/gnrc_sixlowpan_frag_minfwd/main.c b/tests/net/gnrc_sixlowpan_frag_minfwd/main.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/main.c rename to tests/net/gnrc_sixlowpan_frag_minfwd/main.c diff --git a/tests/gnrc_sixlowpan_frag_minfwd/mockup_netif.c b/tests/net/gnrc_sixlowpan_frag_minfwd/mockup_netif.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/mockup_netif.c rename to tests/net/gnrc_sixlowpan_frag_minfwd/mockup_netif.c diff --git a/tests/gnrc_sixlowpan_frag_minfwd/tests/01-run.py b/tests/net/gnrc_sixlowpan_frag_minfwd/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan_frag_minfwd/tests/01-run.py rename to tests/net/gnrc_sixlowpan_frag_minfwd/tests/01-run.py diff --git a/tests/gnrc_sixlowpan_frag_sfr/Makefile b/tests/net/gnrc_sixlowpan_frag_sfr/Makefile similarity index 97% rename from tests/gnrc_sixlowpan_frag_sfr/Makefile rename to tests/net/gnrc_sixlowpan_frag_sfr/Makefile index a0eb859910..5fe020e3d7 100644 --- a/tests/gnrc_sixlowpan_frag_sfr/Makefile +++ b/tests/net/gnrc_sixlowpan_frag_sfr/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_sixlowpan_frag_sfr diff --git a/tests/gnrc_sixlowpan_frag_sfr/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/Makefile.ci rename to tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci diff --git a/tests/gnrc_sixlowpan_frag_sfr/app.config b/tests/net/gnrc_sixlowpan_frag_sfr/app.config similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/app.config rename to tests/net/gnrc_sixlowpan_frag_sfr/app.config diff --git a/tests/gnrc_sixlowpan_frag_sfr/common.h b/tests/net/gnrc_sixlowpan_frag_sfr/common.h similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/common.h rename to tests/net/gnrc_sixlowpan_frag_sfr/common.h diff --git a/tests/gnrc_sixlowpan_frag_sfr/main.c b/tests/net/gnrc_sixlowpan_frag_sfr/main.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/main.c rename to tests/net/gnrc_sixlowpan_frag_sfr/main.c diff --git a/tests/gnrc_sixlowpan_frag_sfr/mockup_netif.c b/tests/net/gnrc_sixlowpan_frag_sfr/mockup_netif.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/mockup_netif.c rename to tests/net/gnrc_sixlowpan_frag_sfr/mockup_netif.c diff --git a/tests/gnrc_sixlowpan_frag_sfr/tests/01-run.py b/tests/net/gnrc_sixlowpan_frag_sfr/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr/tests/01-run.py rename to tests/net/gnrc_sixlowpan_frag_sfr/tests/01-run.py diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/Makefile b/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile similarity index 97% rename from tests/gnrc_sixlowpan_frag_sfr_congure/Makefile rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile index eb5c1777d5..6b4303a4a2 100644 --- a/tests/gnrc_sixlowpan_frag_sfr_congure/Makefile +++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += congure_mock USEMODULE += gnrc_ipv6_router_default diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/app.config b/tests/net/gnrc_sixlowpan_frag_sfr_congure/app.config similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/app.config rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/app.config diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/common.h b/tests/net/gnrc_sixlowpan_frag_sfr_congure/common.h similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/common.h rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/common.h diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/main.c b/tests/net/gnrc_sixlowpan_frag_sfr_congure/main.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/main.c rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/main.c diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c b/tests/net/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure/tests/01-run.py b/tests/net/gnrc_sixlowpan_frag_sfr_congure/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure/tests/01-run.py rename to tests/net/gnrc_sixlowpan_frag_sfr_congure/tests/01-run.py diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile similarity index 97% rename from tests/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile rename to tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile index 03cecb99a1..706361e2a2 100644 --- a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile +++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc_ipv6_router_default diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci rename to tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/README.md b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/README.md similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure_impl/README.md rename to tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/README.md diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/main.c b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/main.c similarity index 100% rename from tests/gnrc_sixlowpan_frag_sfr_congure_impl/main.c rename to tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/main.c diff --git a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py similarity index 94% rename from tests/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py rename to tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py index 30c5e217e9..4bf058179c 100755 --- a/tests/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py +++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/tests/01-run.py @@ -8,6 +8,7 @@ # directory for more details. import contextlib +import os import subprocess import sys import time @@ -19,6 +20,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(), @@ -135,7 +138,7 @@ def test_fragmentation(factory, zep_dispatch): def run_zep_dispatch(): zep_dispatch = Popen( [ - '../../dist/tools/zep_dispatch/bin/zep_dispatch', + ZEP_DISPATCH_PATH, '-t', '-', '127.0.0.1', diff --git a/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile b/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile similarity index 93% rename from tests/gnrc_sixlowpan_iphc_w_vrb/Makefile rename to tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile index 3a10949d67..a3b93fb582 100644 --- a/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile +++ b/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += embunit USEMODULE += gnrc_ipv6_nib_6ln diff --git a/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci b/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci similarity index 100% rename from tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci rename to tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci diff --git a/tests/gnrc_sixlowpan_iphc_w_vrb/main.c b/tests/net/gnrc_sixlowpan_iphc_w_vrb/main.c similarity index 100% rename from tests/gnrc_sixlowpan_iphc_w_vrb/main.c rename to tests/net/gnrc_sixlowpan_iphc_w_vrb/main.c diff --git a/tests/gnrc_sixlowpan_iphc_w_vrb/tests/01-run.py b/tests/net/gnrc_sixlowpan_iphc_w_vrb/tests/01-run.py similarity index 100% rename from tests/gnrc_sixlowpan_iphc_w_vrb/tests/01-run.py rename to tests/net/gnrc_sixlowpan_iphc_w_vrb/tests/01-run.py diff --git a/tests/gnrc_sock_async_event/Makefile b/tests/net/gnrc_sock_async_event/Makefile similarity index 93% rename from tests/gnrc_sock_async_event/Makefile rename to tests/net/gnrc_sock_async_event/Makefile index 1bbfaaf396..b1a293a4de 100644 --- a/tests/gnrc_sock_async_event/Makefile +++ b/tests/net/gnrc_sock_async_event/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc_ipv6_hdr diff --git a/tests/gnrc_sock_async_event/Makefile.ci b/tests/net/gnrc_sock_async_event/Makefile.ci similarity index 100% rename from tests/gnrc_sock_async_event/Makefile.ci rename to tests/net/gnrc_sock_async_event/Makefile.ci diff --git a/tests/gnrc_sock_async_event/main.c b/tests/net/gnrc_sock_async_event/main.c similarity index 100% rename from tests/gnrc_sock_async_event/main.c rename to tests/net/gnrc_sock_async_event/main.c diff --git a/tests/gnrc_sock_async_event/tests/01-run.py b/tests/net/gnrc_sock_async_event/tests/01-run.py similarity index 100% rename from tests/gnrc_sock_async_event/tests/01-run.py rename to tests/net/gnrc_sock_async_event/tests/01-run.py diff --git a/tests/gnrc_sock_dns/Makefile b/tests/net/gnrc_sock_dns/Makefile similarity index 97% rename from tests/gnrc_sock_dns/Makefile rename to tests/net/gnrc_sock_dns/Makefile index 5b60dc584d..d4be69f3f7 100644 --- a/tests/gnrc_sock_dns/Makefile +++ b/tests/net/gnrc_sock_dns/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common RIOTBASE ?= $(CURDIR)/../.. diff --git a/tests/gnrc_sock_dns/Makefile.board.dep b/tests/net/gnrc_sock_dns/Makefile.board.dep similarity index 100% rename from tests/gnrc_sock_dns/Makefile.board.dep rename to tests/net/gnrc_sock_dns/Makefile.board.dep diff --git a/tests/gnrc_sock_dns/Makefile.ci b/tests/net/gnrc_sock_dns/Makefile.ci similarity index 100% rename from tests/gnrc_sock_dns/Makefile.ci rename to tests/net/gnrc_sock_dns/Makefile.ci diff --git a/tests/gnrc_sock_dns/README.md b/tests/net/gnrc_sock_dns/README.md similarity index 100% rename from tests/gnrc_sock_dns/README.md rename to tests/net/gnrc_sock_dns/README.md diff --git a/tests/gnrc_sock_dns/main.c b/tests/net/gnrc_sock_dns/main.c similarity index 100% rename from tests/gnrc_sock_dns/main.c rename to tests/net/gnrc_sock_dns/main.c diff --git a/tests/gnrc_sock_dns/tests-with-config/01-run.py b/tests/net/gnrc_sock_dns/tests-with-config/01-run.py similarity index 100% rename from tests/gnrc_sock_dns/tests-with-config/01-run.py rename to tests/net/gnrc_sock_dns/tests-with-config/01-run.py diff --git a/tests/gnrc_sock_dodtls/Makefile b/tests/net/gnrc_sock_dodtls/Makefile similarity index 96% rename from tests/gnrc_sock_dodtls/Makefile rename to tests/net/gnrc_sock_dodtls/Makefile index 578b487c9c..ced402a594 100644 --- a/tests/gnrc_sock_dodtls/Makefile +++ b/tests/net/gnrc_sock_dodtls/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common RIOTBASE ?= $(CURDIR)/../.. diff --git a/tests/gnrc_sock_dodtls/Makefile.board.dep b/tests/net/gnrc_sock_dodtls/Makefile.board.dep similarity index 100% rename from tests/gnrc_sock_dodtls/Makefile.board.dep rename to tests/net/gnrc_sock_dodtls/Makefile.board.dep diff --git a/tests/gnrc_sock_dodtls/Makefile.ci b/tests/net/gnrc_sock_dodtls/Makefile.ci similarity index 100% rename from tests/gnrc_sock_dodtls/Makefile.ci rename to tests/net/gnrc_sock_dodtls/Makefile.ci diff --git a/tests/gnrc_sock_dodtls/README.md b/tests/net/gnrc_sock_dodtls/README.md similarity index 100% rename from tests/gnrc_sock_dodtls/README.md rename to tests/net/gnrc_sock_dodtls/README.md diff --git a/tests/gnrc_sock_dodtls/main.c b/tests/net/gnrc_sock_dodtls/main.c similarity index 100% rename from tests/gnrc_sock_dodtls/main.c rename to tests/net/gnrc_sock_dodtls/main.c diff --git a/tests/gnrc_sock_ip/Makefile b/tests/net/gnrc_sock_ip/Makefile similarity index 94% rename from tests/gnrc_sock_ip/Makefile rename to tests/net/gnrc_sock_ip/Makefile index 2c49a4d2a7..91d9ed22cc 100644 --- a/tests/gnrc_sock_ip/Makefile +++ b/tests/net/gnrc_sock_ip/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common AUX_LOCAL ?= 1 AUX_TIMESTAMP ?= 1 diff --git a/tests/gnrc_sock_ip/Makefile.ci b/tests/net/gnrc_sock_ip/Makefile.ci similarity index 100% rename from tests/gnrc_sock_ip/Makefile.ci rename to tests/net/gnrc_sock_ip/Makefile.ci diff --git a/tests/gnrc_sock_ip/constants.h b/tests/net/gnrc_sock_ip/constants.h similarity index 100% rename from tests/gnrc_sock_ip/constants.h rename to tests/net/gnrc_sock_ip/constants.h diff --git a/tests/gnrc_sock_ip/main.c b/tests/net/gnrc_sock_ip/main.c similarity index 100% rename from tests/gnrc_sock_ip/main.c rename to tests/net/gnrc_sock_ip/main.c diff --git a/tests/gnrc_sock_ip/stack.c b/tests/net/gnrc_sock_ip/stack.c similarity index 100% rename from tests/gnrc_sock_ip/stack.c rename to tests/net/gnrc_sock_ip/stack.c diff --git a/tests/gnrc_sock_ip/stack.h b/tests/net/gnrc_sock_ip/stack.h similarity index 100% rename from tests/gnrc_sock_ip/stack.h rename to tests/net/gnrc_sock_ip/stack.h diff --git a/tests/gnrc_sock_ip/tests/01-run.py b/tests/net/gnrc_sock_ip/tests/01-run.py similarity index 100% rename from tests/gnrc_sock_ip/tests/01-run.py rename to tests/net/gnrc_sock_ip/tests/01-run.py diff --git a/tests/gnrc_sock_neterr/Makefile b/tests/net/gnrc_sock_neterr/Makefile similarity index 90% rename from tests/gnrc_sock_neterr/Makefile rename to tests/net/gnrc_sock_neterr/Makefile index 197c8ebc6f..6f068b6c59 100644 --- a/tests/gnrc_sock_neterr/Makefile +++ b/tests/net/gnrc_sock_neterr/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc_ipv6_default diff --git a/tests/gnrc_sock_neterr/Makefile.ci b/tests/net/gnrc_sock_neterr/Makefile.ci similarity index 100% rename from tests/gnrc_sock_neterr/Makefile.ci rename to tests/net/gnrc_sock_neterr/Makefile.ci diff --git a/tests/gnrc_sock_neterr/README.md b/tests/net/gnrc_sock_neterr/README.md similarity index 100% rename from tests/gnrc_sock_neterr/README.md rename to tests/net/gnrc_sock_neterr/README.md diff --git a/tests/gnrc_sock_neterr/main.c b/tests/net/gnrc_sock_neterr/main.c similarity index 100% rename from tests/gnrc_sock_neterr/main.c rename to tests/net/gnrc_sock_neterr/main.c diff --git a/tests/gnrc_sock_neterr/tests/01-run.py b/tests/net/gnrc_sock_neterr/tests/01-run.py similarity index 100% rename from tests/gnrc_sock_neterr/tests/01-run.py rename to tests/net/gnrc_sock_neterr/tests/01-run.py diff --git a/tests/gnrc_sock_tcp/Makefile b/tests/net/gnrc_sock_tcp/Makefile similarity index 97% rename from tests/gnrc_sock_tcp/Makefile rename to tests/net/gnrc_sock_tcp/Makefile index 8313f61374..17ecf9d095 100644 --- a/tests/gnrc_sock_tcp/Makefile +++ b/tests/net/gnrc_sock_tcp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common # Basic Configuration BOARD ?= native diff --git a/tests/gnrc_sock_tcp/Makefile.board.dep b/tests/net/gnrc_sock_tcp/Makefile.board.dep similarity index 100% rename from tests/gnrc_sock_tcp/Makefile.board.dep rename to tests/net/gnrc_sock_tcp/Makefile.board.dep diff --git a/tests/gnrc_sock_tcp/Makefile.ci b/tests/net/gnrc_sock_tcp/Makefile.ci similarity index 100% rename from tests/gnrc_sock_tcp/Makefile.ci rename to tests/net/gnrc_sock_tcp/Makefile.ci diff --git a/tests/gnrc_sock_tcp/README.md b/tests/net/gnrc_sock_tcp/README.md similarity index 100% rename from tests/gnrc_sock_tcp/README.md rename to tests/net/gnrc_sock_tcp/README.md diff --git a/tests/gnrc_sock_tcp/main.c b/tests/net/gnrc_sock_tcp/main.c similarity index 100% rename from tests/gnrc_sock_tcp/main.c rename to tests/net/gnrc_sock_tcp/main.c diff --git a/tests/gnrc_sock_tcp/tests-as-root/01-run.py b/tests/net/gnrc_sock_tcp/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_sock_tcp/tests-as-root/01-run.py rename to tests/net/gnrc_sock_tcp/tests-as-root/01-run.py diff --git a/tests/gnrc_sock_tcp/tests-as-root/helpers.py b/tests/net/gnrc_sock_tcp/tests-as-root/helpers.py similarity index 100% rename from tests/gnrc_sock_tcp/tests-as-root/helpers.py rename to tests/net/gnrc_sock_tcp/tests-as-root/helpers.py diff --git a/tests/gnrc_sock_udp/Makefile b/tests/net/gnrc_sock_udp/Makefile similarity index 94% rename from tests/gnrc_sock_udp/Makefile rename to tests/net/gnrc_sock_udp/Makefile index 66fbd83ad5..0af901c049 100644 --- a/tests/gnrc_sock_udp/Makefile +++ b/tests/net/gnrc_sock_udp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common AUX_LOCAL ?= 1 AUX_TIMESTAMP ?= 1 diff --git a/tests/gnrc_sock_udp/Makefile.ci b/tests/net/gnrc_sock_udp/Makefile.ci similarity index 100% rename from tests/gnrc_sock_udp/Makefile.ci rename to tests/net/gnrc_sock_udp/Makefile.ci diff --git a/tests/gnrc_sock_udp/constants.h b/tests/net/gnrc_sock_udp/constants.h similarity index 100% rename from tests/gnrc_sock_udp/constants.h rename to tests/net/gnrc_sock_udp/constants.h diff --git a/tests/gnrc_sock_udp/main.c b/tests/net/gnrc_sock_udp/main.c similarity index 100% rename from tests/gnrc_sock_udp/main.c rename to tests/net/gnrc_sock_udp/main.c diff --git a/tests/gnrc_sock_udp/stack.c b/tests/net/gnrc_sock_udp/stack.c similarity index 100% rename from tests/gnrc_sock_udp/stack.c rename to tests/net/gnrc_sock_udp/stack.c diff --git a/tests/gnrc_sock_udp/stack.h b/tests/net/gnrc_sock_udp/stack.h similarity index 100% rename from tests/gnrc_sock_udp/stack.h rename to tests/net/gnrc_sock_udp/stack.h diff --git a/tests/gnrc_sock_udp/tests/01-run.py b/tests/net/gnrc_sock_udp/tests/01-run.py similarity index 100% rename from tests/gnrc_sock_udp/tests/01-run.py rename to tests/net/gnrc_sock_udp/tests/01-run.py diff --git a/tests/gnrc_tcp/Makefile b/tests/net/gnrc_tcp/Makefile similarity index 98% rename from tests/gnrc_tcp/Makefile rename to tests/net/gnrc_tcp/Makefile index a06c7f6949..fff4172cf8 100644 --- a/tests/gnrc_tcp/Makefile +++ b/tests/net/gnrc_tcp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common # Basic Configuration BOARD ?= native diff --git a/tests/gnrc_tcp/Makefile.board.dep b/tests/net/gnrc_tcp/Makefile.board.dep similarity index 100% rename from tests/gnrc_tcp/Makefile.board.dep rename to tests/net/gnrc_tcp/Makefile.board.dep diff --git a/tests/gnrc_tcp/Makefile.ci b/tests/net/gnrc_tcp/Makefile.ci similarity index 100% rename from tests/gnrc_tcp/Makefile.ci rename to tests/net/gnrc_tcp/Makefile.ci diff --git a/tests/gnrc_tcp/README.md b/tests/net/gnrc_tcp/README.md similarity index 100% rename from tests/gnrc_tcp/README.md rename to tests/net/gnrc_tcp/README.md diff --git a/tests/gnrc_tcp/main.c b/tests/net/gnrc_tcp/main.c similarity index 100% rename from tests/gnrc_tcp/main.c rename to tests/net/gnrc_tcp/main.c diff --git a/tests/gnrc_tcp/tests-as-root/01-run.py b/tests/net/gnrc_tcp/tests-as-root/01-run.py similarity index 100% rename from tests/gnrc_tcp/tests-as-root/01-run.py rename to tests/net/gnrc_tcp/tests-as-root/01-run.py diff --git a/tests/gnrc_tcp/tests-as-root/helpers.py b/tests/net/gnrc_tcp/tests-as-root/helpers.py similarity index 100% rename from tests/gnrc_tcp/tests-as-root/helpers.py rename to tests/net/gnrc_tcp/tests-as-root/helpers.py diff --git a/tests/gnrc_tx_sync/Makefile b/tests/net/gnrc_tx_sync/Makefile similarity index 94% rename from tests/gnrc_tx_sync/Makefile rename to tests/net/gnrc_tx_sync/Makefile index fbc31e25a1..dd7d7e8793 100644 --- a/tests/gnrc_tx_sync/Makefile +++ b/tests/net/gnrc_tx_sync/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common TEST_6LO ?= 1 TEST_FRAG_SFR ?= 1 diff --git a/tests/gnrc_tx_sync/Makefile.ci b/tests/net/gnrc_tx_sync/Makefile.ci similarity index 100% rename from tests/gnrc_tx_sync/Makefile.ci rename to tests/net/gnrc_tx_sync/Makefile.ci diff --git a/tests/gnrc_tx_sync/main.c b/tests/net/gnrc_tx_sync/main.c similarity index 100% rename from tests/gnrc_tx_sync/main.c rename to tests/net/gnrc_tx_sync/main.c diff --git a/tests/gnrc_tx_sync/tests/01-run.py b/tests/net/gnrc_tx_sync/tests/01-run.py similarity index 100% rename from tests/gnrc_tx_sync/tests/01-run.py rename to tests/net/gnrc_tx_sync/tests/01-run.py diff --git a/tests/gnrc_udp/Makefile b/tests/net/gnrc_udp/Makefile similarity index 95% rename from tests/gnrc_udp/Makefile rename to tests/net/gnrc_udp/Makefile index 21de74a960..13186248dc 100644 --- a/tests/gnrc_udp/Makefile +++ b/tests/net/gnrc_udp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += netdev_default USEMODULE += auto_init_gnrc_netif diff --git a/tests/gnrc_udp/Makefile.ci b/tests/net/gnrc_udp/Makefile.ci similarity index 100% rename from tests/gnrc_udp/Makefile.ci rename to tests/net/gnrc_udp/Makefile.ci diff --git a/tests/gnrc_udp/README.md b/tests/net/gnrc_udp/README.md similarity index 100% rename from tests/gnrc_udp/README.md rename to tests/net/gnrc_udp/README.md diff --git a/tests/gnrc_udp/main.c b/tests/net/gnrc_udp/main.c similarity index 100% rename from tests/gnrc_udp/main.c rename to tests/net/gnrc_udp/main.c diff --git a/tests/gnrc_udp/udp.c b/tests/net/gnrc_udp/udp.c similarity index 100% rename from tests/gnrc_udp/udp.c rename to tests/net/gnrc_udp/udp.c diff --git a/tests/ieee802154_hal/Makefile b/tests/net/ieee802154_hal/Makefile similarity index 97% rename from tests/ieee802154_hal/Makefile rename to tests/net/ieee802154_hal/Makefile index 7cb7cb8c24..c684e36a22 100644 --- a/tests/ieee802154_hal/Makefile +++ b/tests/net/ieee802154_hal/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common # Due to missing Kconfig support, whitelist boards that are known to have a # working Kconfig dependency resolution. diff --git a/tests/ieee802154_hal/Makefile.ci b/tests/net/ieee802154_hal/Makefile.ci similarity index 100% rename from tests/ieee802154_hal/Makefile.ci rename to tests/net/ieee802154_hal/Makefile.ci diff --git a/tests/ieee802154_hal/app.config.test b/tests/net/ieee802154_hal/app.config.test similarity index 100% rename from tests/ieee802154_hal/app.config.test rename to tests/net/ieee802154_hal/app.config.test diff --git a/tests/ieee802154_hal/app.config.test.native b/tests/net/ieee802154_hal/app.config.test.native similarity index 100% rename from tests/ieee802154_hal/app.config.test.native rename to tests/net/ieee802154_hal/app.config.test.native diff --git a/tests/ieee802154_hal/common.h b/tests/net/ieee802154_hal/common.h similarity index 100% rename from tests/ieee802154_hal/common.h rename to tests/net/ieee802154_hal/common.h diff --git a/tests/ieee802154_hal/init_devs.c b/tests/net/ieee802154_hal/init_devs.c similarity index 100% rename from tests/ieee802154_hal/init_devs.c rename to tests/net/ieee802154_hal/init_devs.c diff --git a/tests/ieee802154_hal/main.c b/tests/net/ieee802154_hal/main.c similarity index 100% rename from tests/ieee802154_hal/main.c rename to tests/net/ieee802154_hal/main.c diff --git a/tests/ieee802154_security/Makefile b/tests/net/ieee802154_security/Makefile similarity index 80% rename from tests/ieee802154_security/Makefile rename to tests/net/ieee802154_security/Makefile index cb2a6ec9f9..628a19ded2 100644 --- a/tests/ieee802154_security/Makefile +++ b/tests/net/ieee802154_security/Makefile @@ -2,5 +2,5 @@ USEMODULE += ieee802154 USEMODULE += ieee802154_security USEMODULE += gnrc_netif_ieee802154 -include ../Makefile.tests_common +include ../Makefile.net_common include ../netdev_common/Makefile.netdev.mk diff --git a/tests/ieee802154_security/Makefile.ci b/tests/net/ieee802154_security/Makefile.ci similarity index 100% rename from tests/ieee802154_security/Makefile.ci rename to tests/net/ieee802154_security/Makefile.ci diff --git a/tests/ieee802154_security/README.md b/tests/net/ieee802154_security/README.md similarity index 100% rename from tests/ieee802154_security/README.md rename to tests/net/ieee802154_security/README.md diff --git a/tests/ieee802154_security/main.c b/tests/net/ieee802154_security/main.c similarity index 100% rename from tests/ieee802154_security/main.c rename to tests/net/ieee802154_security/main.c diff --git a/tests/ieee802154_submac/Makefile b/tests/net/ieee802154_submac/Makefile similarity index 97% rename from tests/ieee802154_submac/Makefile rename to tests/net/ieee802154_submac/Makefile index 8f4b22467a..2dec0b082d 100644 --- a/tests/ieee802154_submac/Makefile +++ b/tests/net/ieee802154_submac/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common # # Due to missing Kconfig support, whitelist boards that are known to have a # working Kconfig dependency resolution. diff --git a/tests/ieee802154_submac/common.h b/tests/net/ieee802154_submac/common.h similarity index 100% rename from tests/ieee802154_submac/common.h rename to tests/net/ieee802154_submac/common.h diff --git a/tests/ieee802154_submac/init_devs.c b/tests/net/ieee802154_submac/init_devs.c similarity index 100% rename from tests/ieee802154_submac/init_devs.c rename to tests/net/ieee802154_submac/init_devs.c diff --git a/tests/ieee802154_submac/main.c b/tests/net/ieee802154_submac/main.c similarity index 100% rename from tests/ieee802154_submac/main.c rename to tests/net/ieee802154_submac/main.c diff --git a/tests/l2util/Makefile b/tests/net/l2util/Makefile similarity index 94% rename from tests/l2util/Makefile rename to tests/net/l2util/Makefile index d39cacf716..649439128d 100644 --- a/tests/l2util/Makefile +++ b/tests/net/l2util/Makefile @@ -1,6 +1,6 @@ DEVELHELP = 0 -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += embunit USEMODULE += l2util diff --git a/tests/l2util/Makefile.ci b/tests/net/l2util/Makefile.ci similarity index 100% rename from tests/l2util/Makefile.ci rename to tests/net/l2util/Makefile.ci diff --git a/tests/l2util/common.h b/tests/net/l2util/common.h similarity index 100% rename from tests/l2util/common.h rename to tests/net/l2util/common.h diff --git a/tests/l2util/main.c b/tests/net/l2util/main.c similarity index 100% rename from tests/l2util/main.c rename to tests/net/l2util/main.c diff --git a/tests/embunit/tests/01-run.py b/tests/net/l2util/tests/01-run.py similarity index 100% rename from tests/embunit/tests/01-run.py rename to tests/net/l2util/tests/01-run.py diff --git a/tests/nanocoap_cli/Makefile b/tests/net/nanocoap_cli/Makefile similarity index 97% rename from tests/nanocoap_cli/Makefile rename to tests/net/nanocoap_cli/Makefile index 0b5193d830..0982613d39 100644 --- a/tests/nanocoap_cli/Makefile +++ b/tests/net/nanocoap_cli/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common # Include packages that pull up and auto-init the link layer. # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present diff --git a/tests/nanocoap_cli/Makefile.ci b/tests/net/nanocoap_cli/Makefile.ci similarity index 100% rename from tests/nanocoap_cli/Makefile.ci rename to tests/net/nanocoap_cli/Makefile.ci diff --git a/tests/nanocoap_cli/README.md b/tests/net/nanocoap_cli/README.md similarity index 100% rename from tests/nanocoap_cli/README.md rename to tests/net/nanocoap_cli/README.md diff --git a/tests/nanocoap_cli/main.c b/tests/net/nanocoap_cli/main.c similarity index 100% rename from tests/nanocoap_cli/main.c rename to tests/net/nanocoap_cli/main.c diff --git a/tests/nanocoap_cli/nanocli_client.c b/tests/net/nanocoap_cli/nanocli_client.c similarity index 100% rename from tests/nanocoap_cli/nanocli_client.c rename to tests/net/nanocoap_cli/nanocli_client.c diff --git a/tests/nanocoap_cli/nanocli_server.c b/tests/net/nanocoap_cli/nanocli_server.c similarity index 100% rename from tests/nanocoap_cli/nanocli_server.c rename to tests/net/nanocoap_cli/nanocli_server.c diff --git a/tests/nanocoap_cli/request_handlers.c b/tests/net/nanocoap_cli/request_handlers.c similarity index 100% rename from tests/nanocoap_cli/request_handlers.c rename to tests/net/nanocoap_cli/request_handlers.c diff --git a/tests/nanocoap_cli/tinydtls_keys.h b/tests/net/nanocoap_cli/tinydtls_keys.h similarity index 100% rename from tests/nanocoap_cli/tinydtls_keys.h rename to tests/net/nanocoap_cli/tinydtls_keys.h diff --git a/tests/netdev_common/Makefile b/tests/net/netdev_common/Makefile similarity index 84% rename from tests/netdev_common/Makefile rename to tests/net/netdev_common/Makefile index c3844b1d73..aaeb222a9b 100644 --- a/tests/netdev_common/Makefile +++ b/tests/net/netdev_common/Makefile @@ -3,5 +3,5 @@ USEMODULE += netdev_default EXTERNAL_BOARD_DIRS += $(CURDIR)/../external_board_dirs/netdev-ci-boards -include ../Makefile.tests_common +include ../Makefile.net_common include Makefile.netdev.mk diff --git a/tests/netdev_common/Makefile.ci b/tests/net/netdev_common/Makefile.ci similarity index 100% rename from tests/netdev_common/Makefile.ci rename to tests/net/netdev_common/Makefile.ci diff --git a/tests/netdev_common/Makefile.netdev.mk b/tests/net/netdev_common/Makefile.netdev.mk similarity index 100% rename from tests/netdev_common/Makefile.netdev.mk rename to tests/net/netdev_common/Makefile.netdev.mk diff --git a/tests/netdev_common/main.c b/tests/net/netdev_common/main.c similarity index 100% rename from tests/netdev_common/main.c rename to tests/net/netdev_common/main.c diff --git a/tests/netdev_test/Makefile b/tests/net/netdev_test/Makefile similarity index 94% rename from tests/netdev_test/Makefile rename to tests/net/netdev_test/Makefile index 6dcd104569..32b03fdb12 100644 --- a/tests/netdev_test/Makefile +++ b/tests/net/netdev_test/Makefile @@ -2,7 +2,7 @@ # testing this netdev simulating framework, so I it's better if the assert is # ignored. CFLAGS += -DNDEBUG -include ../Makefile.tests_common +include ../Makefile.net_common DISABLE_MODULE += auto_init_gnrc_% diff --git a/tests/netdev_test/Makefile.ci b/tests/net/netdev_test/Makefile.ci similarity index 100% rename from tests/netdev_test/Makefile.ci rename to tests/net/netdev_test/Makefile.ci diff --git a/tests/netdev_test/main.c b/tests/net/netdev_test/main.c similarity index 100% rename from tests/netdev_test/main.c rename to tests/net/netdev_test/main.c diff --git a/tests/netdev_test/tests/01-run.py b/tests/net/netdev_test/tests/01-run.py similarity index 100% rename from tests/netdev_test/tests/01-run.py rename to tests/net/netdev_test/tests/01-run.py diff --git a/tests/netstats_l2/Makefile b/tests/net/netstats_l2/Makefile similarity index 94% rename from tests/netstats_l2/Makefile rename to tests/net/netstats_l2/Makefile index 6b6475952e..0af1b24669 100644 --- a/tests/netstats_l2/Makefile +++ b/tests/net/netstats_l2/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common include $(RIOTBASE)/tests/Makefile.boards.netif BOARD_WHITELIST += $(BOARD_PROVIDES_NETIF) diff --git a/tests/netstats_l2/Makefile.ci b/tests/net/netstats_l2/Makefile.ci similarity index 100% rename from tests/netstats_l2/Makefile.ci rename to tests/net/netstats_l2/Makefile.ci diff --git a/tests/netstats_l2/README.md b/tests/net/netstats_l2/README.md similarity index 100% rename from tests/netstats_l2/README.md rename to tests/net/netstats_l2/README.md diff --git a/tests/netstats_l2/main.c b/tests/net/netstats_l2/main.c similarity index 100% rename from tests/netstats_l2/main.c rename to tests/net/netstats_l2/main.c diff --git a/tests/netstats_l2/tests/01-run.py b/tests/net/netstats_l2/tests/01-run.py similarity index 100% rename from tests/netstats_l2/tests/01-run.py rename to tests/net/netstats_l2/tests/01-run.py diff --git a/tests/netstats_neighbor/Makefile b/tests/net/netstats_neighbor/Makefile similarity index 88% rename from tests/netstats_neighbor/Makefile rename to tests/net/netstats_neighbor/Makefile index 26e4af2a45..863ee56a59 100644 --- a/tests/netstats_neighbor/Makefile +++ b/tests/net/netstats_neighbor/Makefile @@ -6,5 +6,5 @@ USEMODULE += netstats_neighbor_rssi USEMODULE += netstats_neighbor_lqi USEMODULE += netstats_neighbor_tx_time -include ../Makefile.tests_common +include ../Makefile.net_common include ../netdev_common/Makefile.netdev.mk diff --git a/tests/netstats_neighbor/Makefile.ci b/tests/net/netstats_neighbor/Makefile.ci similarity index 100% rename from tests/netstats_neighbor/Makefile.ci rename to tests/net/netstats_neighbor/Makefile.ci diff --git a/tests/netstats_neighbor/main.c b/tests/net/netstats_neighbor/main.c similarity index 100% rename from tests/netstats_neighbor/main.c rename to tests/net/netstats_neighbor/main.c diff --git a/tests/netutils/Makefile b/tests/net/netutils/Makefile similarity index 92% rename from tests/netutils/Makefile rename to tests/net/netutils/Makefile index 08b0d8b799..ef929b0a65 100644 --- a/tests/netutils/Makefile +++ b/tests/net/netutils/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += netutils USEMODULE += netif diff --git a/tests/netutils/Makefile.ci b/tests/net/netutils/Makefile.ci similarity index 100% rename from tests/netutils/Makefile.ci rename to tests/net/netutils/Makefile.ci diff --git a/tests/netutils/main.c b/tests/net/netutils/main.c similarity index 100% rename from tests/netutils/main.c rename to tests/net/netutils/main.c diff --git a/tests/l2util/tests/01-run.py b/tests/net/netutils/tests/01-run.py similarity index 100% rename from tests/l2util/tests/01-run.py rename to tests/net/netutils/tests/01-run.py diff --git a/tests/slip/Makefile b/tests/net/slip/Makefile similarity index 95% rename from tests/slip/Makefile rename to tests/net/slip/Makefile index 59cad46f65..3ad0c88823 100644 --- a/tests/slip/Makefile +++ b/tests/net/slip/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc diff --git a/tests/slip/Makefile.ci b/tests/net/slip/Makefile.ci similarity index 100% rename from tests/slip/Makefile.ci rename to tests/net/slip/Makefile.ci diff --git a/tests/slip/main.c b/tests/net/slip/main.c similarity index 100% rename from tests/slip/main.c rename to tests/net/slip/main.c diff --git a/tests/sntp/Makefile b/tests/net/sntp/Makefile similarity index 84% rename from tests/sntp/Makefile rename to tests/net/sntp/Makefile index 68e5bb35ec..062d65572c 100644 --- a/tests/sntp/Makefile +++ b/tests/net/sntp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common USEMODULE += sntp USEMODULE += gnrc_ipv6_default diff --git a/tests/sntp/Makefile.ci b/tests/net/sntp/Makefile.ci similarity index 100% rename from tests/sntp/Makefile.ci rename to tests/net/sntp/Makefile.ci diff --git a/tests/sntp/README.md b/tests/net/sntp/README.md similarity index 100% rename from tests/sntp/README.md rename to tests/net/sntp/README.md diff --git a/tests/sntp/main.c b/tests/net/sntp/main.c similarity index 100% rename from tests/sntp/main.c rename to tests/net/sntp/main.c diff --git a/tests/sock_udp_aux/Makefile b/tests/net/sock_udp_aux/Makefile similarity index 93% rename from tests/sock_udp_aux/Makefile rename to tests/net/sock_udp_aux/Makefile index d6e32d3e6e..84337ae204 100644 --- a/tests/sock_udp_aux/Makefile +++ b/tests/net/sock_udp_aux/Makefile @@ -1,5 +1,5 @@ BOARD ?= nucleo-f767zi -include ../Makefile.tests_common +include ../Makefile.net_common # Enable hardware timestamping, if possible FEATURES_OPTIONAL += periph_ptp periph_eth diff --git a/tests/sock_udp_aux/Makefile.ci b/tests/net/sock_udp_aux/Makefile.ci similarity index 100% rename from tests/sock_udp_aux/Makefile.ci rename to tests/net/sock_udp_aux/Makefile.ci diff --git a/tests/sock_udp_aux/main.c b/tests/net/sock_udp_aux/main.c similarity index 100% rename from tests/sock_udp_aux/main.c rename to tests/net/sock_udp_aux/main.c diff --git a/tests/socket_zep/Makefile b/tests/net/socket_zep/Makefile similarity index 85% rename from tests/socket_zep/Makefile rename to tests/net/socket_zep/Makefile index b3131fa859..18ec781596 100644 --- a/tests/socket_zep/Makefile +++ b/tests/net/socket_zep/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.net_common BOARD_WHITELIST = native # socket_zep is only available on native diff --git a/tests/socket_zep/main.c b/tests/net/socket_zep/main.c similarity index 100% rename from tests/socket_zep/main.c rename to tests/net/socket_zep/main.c diff --git a/tests/socket_zep/tests/01-run.py b/tests/net/socket_zep/tests/01-run.py similarity index 100% rename from tests/socket_zep/tests/01-run.py rename to tests/net/socket_zep/tests/01-run.py diff --git a/tests/dbgpin/Makefile b/tests/sys/dbgpin/Makefile similarity index 93% rename from tests/dbgpin/Makefile rename to tests/sys/dbgpin/Makefile index f5dcb56ef5..46926de67f 100644 --- a/tests/dbgpin/Makefile +++ b/tests/sys/dbgpin/Makefile @@ -1,6 +1,6 @@ BOARD ?= nucleo-f767zi -include ../Makefile.tests_common +include ../Makefile.sys_common USEMODULE += dbgpin USEMODULE += xtimer diff --git a/tests/dbgpin/main.c b/tests/sys/dbgpin/main.c similarity index 100% rename from tests/dbgpin/main.c rename to tests/sys/dbgpin/main.c diff --git a/tests/dbgpin/tests/01-run.py b/tests/sys/dbgpin/tests/01-run.py similarity index 100% rename from tests/dbgpin/tests/01-run.py rename to tests/sys/dbgpin/tests/01-run.py diff --git a/tests/embunit/Makefile b/tests/sys/embunit/Makefile similarity index 76% rename from tests/embunit/Makefile rename to tests/sys/embunit/Makefile index a5aa0490fd..180940feaa 100644 --- a/tests/embunit/Makefile +++ b/tests/sys/embunit/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.sys_common USEMODULE += embunit diff --git a/tests/embunit/main.c b/tests/sys/embunit/main.c similarity index 100% rename from tests/embunit/main.c rename to tests/sys/embunit/main.c diff --git a/tests/netutils/tests/01-run.py b/tests/sys/embunit/tests/01-run.py similarity index 100% rename from tests/netutils/tests/01-run.py rename to tests/sys/embunit/tests/01-run.py diff --git a/tests/entropy_source/Makefile b/tests/sys/entropy_source/Makefile similarity index 81% rename from tests/entropy_source/Makefile rename to tests/sys/entropy_source/Makefile index 2375780b95..7b4cd1f289 100644 --- a/tests/entropy_source/Makefile +++ b/tests/sys/entropy_source/Makefile @@ -1,5 +1,5 @@ DEVELHELP ?= 0 -include ../Makefile.tests_common +include ../Makefile.sys_common BOARD ?= native diff --git a/tests/entropy_source/Makefile.board.dep b/tests/sys/entropy_source/Makefile.board.dep similarity index 100% rename from tests/entropy_source/Makefile.board.dep rename to tests/sys/entropy_source/Makefile.board.dep diff --git a/tests/entropy_source/README.md b/tests/sys/entropy_source/README.md similarity index 100% rename from tests/entropy_source/README.md rename to tests/sys/entropy_source/README.md diff --git a/tests/entropy_source/main.c b/tests/sys/entropy_source/main.c similarity index 100% rename from tests/entropy_source/main.c rename to tests/sys/entropy_source/main.c diff --git a/tests/float/Makefile b/tests/sys/float/Makefile similarity index 53% rename from tests/float/Makefile rename to tests/sys/float/Makefile index 24bb481657..474ad5124a 100644 --- a/tests/float/Makefile +++ b/tests/sys/float/Makefile @@ -1,3 +1,3 @@ -include ../Makefile.tests_common +include ../Makefile.sys_common include $(RIOTBASE)/Makefile.include diff --git a/tests/float/README.md b/tests/sys/float/README.md similarity index 100% rename from tests/float/README.md rename to tests/sys/float/README.md diff --git a/tests/float/main.c b/tests/sys/float/main.c similarity index 100% rename from tests/float/main.c rename to tests/sys/float/main.c diff --git a/tests/float/tests/01-run.py b/tests/sys/float/tests/01-run.py similarity index 100% rename from tests/float/tests/01-run.py rename to tests/sys/float/tests/01-run.py diff --git a/tests/heap_cmd/Makefile b/tests/sys/heap_cmd/Makefile similarity index 85% rename from tests/heap_cmd/Makefile rename to tests/sys/heap_cmd/Makefile index c697144c0c..99f430622f 100644 --- a/tests/heap_cmd/Makefile +++ b/tests/sys/heap_cmd/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.sys_common USEMODULE += shell USEMODULE += shell_cmd_heap diff --git a/tests/heap_cmd/Makefile.ci b/tests/sys/heap_cmd/Makefile.ci similarity index 100% rename from tests/heap_cmd/Makefile.ci rename to tests/sys/heap_cmd/Makefile.ci diff --git a/tests/heap_cmd/README.md b/tests/sys/heap_cmd/README.md similarity index 100% rename from tests/heap_cmd/README.md rename to tests/sys/heap_cmd/README.md diff --git a/tests/heap_cmd/app.config.test b/tests/sys/heap_cmd/app.config.test similarity index 100% rename from tests/heap_cmd/app.config.test rename to tests/sys/heap_cmd/app.config.test diff --git a/tests/heap_cmd/main.c b/tests/sys/heap_cmd/main.c similarity index 100% rename from tests/heap_cmd/main.c rename to tests/sys/heap_cmd/main.c diff --git a/tests/heap_cmd/tests/01-run.py b/tests/sys/heap_cmd/tests/01-run.py similarity index 100% rename from tests/heap_cmd/tests/01-run.py rename to tests/sys/heap_cmd/tests/01-run.py diff --git a/tests/ssp/Makefile b/tests/sys/ssp/Makefile similarity index 93% rename from tests/ssp/Makefile rename to tests/sys/ssp/Makefile index 9e141f5c99..276c616eb2 100644 --- a/tests/ssp/Makefile +++ b/tests/sys/ssp/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.sys_common USEMODULE += ssp diff --git a/tests/ssp/main.c b/tests/sys/ssp/main.c similarity index 100% rename from tests/ssp/main.c rename to tests/sys/ssp/main.c diff --git a/tests/ssp/tests/01-run.py b/tests/sys/ssp/tests/01-run.py similarity index 100% rename from tests/ssp/tests/01-run.py rename to tests/sys/ssp/tests/01-run.py diff --git a/tests/stdin/Makefile b/tests/sys/stdin/Makefile similarity index 76% rename from tests/stdin/Makefile rename to tests/sys/stdin/Makefile index 9a120a17f8..54f6f1a4c8 100644 --- a/tests/stdin/Makefile +++ b/tests/sys/stdin/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.sys_common USEMODULE += stdin diff --git a/tests/stdin/main.c b/tests/sys/stdin/main.c similarity index 100% rename from tests/stdin/main.c rename to tests/sys/stdin/main.c diff --git a/tests/stdin/tests/01-run.py b/tests/sys/stdin/tests/01-run.py similarity index 100% rename from tests/stdin/tests/01-run.py rename to tests/sys/stdin/tests/01-run.py