review: Move netdev_common back to tests

RIOT-OS · Apr 25, 2023 · 14efca8 · 14efca8
1 parent 08c707b
commit 14efca8
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 49 deletions.
diff --git a/tests/drivers/atwinc15x0/Makefile b/tests/drivers/atwinc15x0/Makefile
@@ -4,4 +4,5 @@ USEMODULE = atwinc15x0
 # msp430-gcc doesn't support -Wno-discarded-qualifiers
 FEATURES_BLACKLIST += arch_msp430 cpu_core_atxmega
 
-include ../netdev_common/Makefile.netdev.mk
+include ../Makefile.drivers_common
+include ../../netdev_common/Makefile.netdev.mk
diff --git a/tests/drivers/atwinc15x0/main.c b/tests/drivers/atwinc15x0/main.c
@@ -1 +1 @@
-../driver_netdev_common/main.c
+../../netdev_common/main.c
diff --git a/tests/drivers/xbee/Makefile b/tests/drivers/xbee/Makefile
@@ -2,5 +2,5 @@ USEMODULE += xbee
 
 # No need of big buffer for this test
 GNRC_PKTBUF_SIZE ?= 512
-
-include ../netdev_common/Makefile.netdev.mk
+include ../Makefile.drivers_common
+include ../../netdev_common/Makefile.netdev.mk
diff --git a/tests/drivers/xbee/main.c b/tests/drivers/xbee/main.c
@@ -1 +1 @@
-../netdev_common/main.c
+../../netdev_common/main.c
diff --git a/tests/ieee802154_security/Makefile b/tests/ieee802154_security/Makefile
@@ -2,4 +2,5 @@ USEMODULE += ieee802154
 USEMODULE += ieee802154_security
 USEMODULE += gnrc_netif_ieee802154
 
-include ../driver_netdev_common/Makefile.netdev.mk
+include ../Makefile.tests_common
+include ../netdev_common/Makefile.netdev.mk
diff --git a/tests/ieee802154_security/main.c b/tests/ieee802154_security/main.c
diff --git a/tests/ieee802154_security/main.c b/tests/ieee802154_security/main.c
@@ -0,0 +1 @@
+../netdev_common/main.c
diff --git a/tests/drivers/netdev_common/Makefile → tests/netdev_common/Makefile b/tests/drivers/netdev_common/Makefile → tests/netdev_common/Makefile
@@ -3,4 +3,5 @@ USEMODULE += netdev_default
 
 EXTERNAL_BOARD_DIRS += $(CURDIR)/../external_board_dirs/netdev-ci-boards
 
+include ../Makefile.tests_common
 include Makefile.netdev.mk
diff --git a/tests/drivers/netdev_common/Makefile.ci → tests/netdev_common/Makefile.ci b/tests/drivers/netdev_common/Makefile.ci → tests/netdev_common/Makefile.ci
diff --git a/.../drivers/netdev_common/Makefile.netdev.mk → tests/netdev_common/Makefile.netdev.mk b/.../drivers/netdev_common/Makefile.netdev.mk → tests/netdev_common/Makefile.netdev.mk
@@ -1,5 +1,3 @@
-include ../Makefile.drivers_common
-
 # Modules to include:
 USEMODULE += shell_cmds_default
 USEMODULE += ps

diff --git a/tests/drivers/netdev_common/main.c → tests/netdev_common/main.c b/tests/drivers/netdev_common/main.c → tests/netdev_common/main.c
diff --git a/tests/netstats_neighbor/Makefile b/tests/netstats_neighbor/Makefile
@@ -6,4 +6,5 @@ USEMODULE += netstats_neighbor_rssi
 USEMODULE += netstats_neighbor_lqi
 USEMODULE += netstats_neighbor_tx_time
 
-include ../driver_netdev_common/Makefile.netdev.mk
+include ../Makefile.tests_common
+include ../netdev_common/Makefile.netdev.mk
diff --git a/tests/netstats_neighbor/main.c b/tests/netstats_neighbor/main.c
@@ -1 +1 @@
-../driver_netdev_common/main.c
+../netdev_common/main.c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../driver_netdev_common/main.c
		../../netdev_common/main.c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../netdev_common/main.c
		../../netdev_common/main.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,5 @@ USEMODULE += netdev_default

		EXTERNAL_BOARD_DIRS += $(CURDIR)/../external_board_dirs/netdev-ci-boards

		include ../Makefile.tests_common
		include Makefile.netdev.mk