diff --git a/tests/nimble_autoconn_ccnl/Makefile b/tests/pkg/nimble_autoconn_ccnl/Makefile similarity index 94% rename from tests/nimble_autoconn_ccnl/Makefile rename to tests/pkg/nimble_autoconn_ccnl/Makefile index 2e3cd7980d..c2d44a77aa 100644 --- a/tests/nimble_autoconn_ccnl/Makefile +++ b/tests/pkg/nimble_autoconn_ccnl/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_autoconn_ccnl/Makefile.ci b/tests/pkg/nimble_autoconn_ccnl/Makefile.ci similarity index 100% rename from tests/nimble_autoconn_ccnl/Makefile.ci rename to tests/pkg/nimble_autoconn_ccnl/Makefile.ci diff --git a/tests/nimble_autoconn_ccnl/main.c b/tests/pkg/nimble_autoconn_ccnl/main.c similarity index 100% rename from tests/nimble_autoconn_ccnl/main.c rename to tests/pkg/nimble_autoconn_ccnl/main.c diff --git a/tests/nimble_autoconn_gnrc/Makefile b/tests/pkg/nimble_autoconn_gnrc/Makefile similarity index 92% rename from tests/nimble_autoconn_gnrc/Makefile rename to tests/pkg/nimble_autoconn_gnrc/Makefile index f0147fd783..448b47ca33 100644 --- a/tests/nimble_autoconn_gnrc/Makefile +++ b/tests/pkg/nimble_autoconn_gnrc/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_autoconn_gnrc/Makefile.ci b/tests/pkg/nimble_autoconn_gnrc/Makefile.ci similarity index 100% rename from tests/nimble_autoconn_gnrc/Makefile.ci rename to tests/pkg/nimble_autoconn_gnrc/Makefile.ci diff --git a/tests/nimble_autoconn_gnrc/main.c b/tests/pkg/nimble_autoconn_gnrc/main.c similarity index 100% rename from tests/nimble_autoconn_gnrc/main.c rename to tests/pkg/nimble_autoconn_gnrc/main.c diff --git a/tests/nimble_autoconn_gnrc_ext/Makefile b/tests/pkg/nimble_autoconn_gnrc_ext/Makefile similarity index 94% rename from tests/nimble_autoconn_gnrc_ext/Makefile rename to tests/pkg/nimble_autoconn_gnrc_ext/Makefile index 33b08364cc..d435f6590b 100644 --- a/tests/nimble_autoconn_gnrc_ext/Makefile +++ b/tests/pkg/nimble_autoconn_gnrc_ext/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_autoconn_gnrc_ext/Makefile.ci b/tests/pkg/nimble_autoconn_gnrc_ext/Makefile.ci similarity index 100% rename from tests/nimble_autoconn_gnrc_ext/Makefile.ci rename to tests/pkg/nimble_autoconn_gnrc_ext/Makefile.ci diff --git a/tests/nimble_autoconn_gnrc_ext/main.c b/tests/pkg/nimble_autoconn_gnrc_ext/main.c similarity index 100% rename from tests/nimble_autoconn_gnrc_ext/main.c rename to tests/pkg/nimble_autoconn_gnrc_ext/main.c diff --git a/tests/nimble_esp_wifi_coexist/Makefile b/tests/pkg/nimble_esp_wifi_coexist/Makefile similarity index 98% rename from tests/nimble_esp_wifi_coexist/Makefile rename to tests/pkg/nimble_esp_wifi_coexist/Makefile index ba01f6e7bf..3e16bcd58b 100644 --- a/tests/nimble_esp_wifi_coexist/Makefile +++ b/tests/pkg/nimble_esp_wifi_coexist/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.pkg_common # If no BOARD is found in the environment, use this default: BOARD ?= esp32-wroom-32 diff --git a/tests/nimble_esp_wifi_coexist/README.md b/tests/pkg/nimble_esp_wifi_coexist/README.md similarity index 100% rename from tests/nimble_esp_wifi_coexist/README.md rename to tests/pkg/nimble_esp_wifi_coexist/README.md diff --git a/tests/nimble_esp_wifi_coexist/main.c b/tests/pkg/nimble_esp_wifi_coexist/main.c similarity index 100% rename from tests/nimble_esp_wifi_coexist/main.c rename to tests/pkg/nimble_esp_wifi_coexist/main.c diff --git a/tests/nimble_ext_adv/Makefile b/tests/pkg/nimble_ext_adv/Makefile similarity index 94% rename from tests/nimble_ext_adv/Makefile rename to tests/pkg/nimble_ext_adv/Makefile index cf1735b8d1..d6280fdac1 100644 --- a/tests/nimble_ext_adv/Makefile +++ b/tests/pkg/nimble_ext_adv/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52840dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # we want shell support USEMODULE += shell diff --git a/tests/nimble_ext_adv/Makefile.ci b/tests/pkg/nimble_ext_adv/Makefile.ci similarity index 100% rename from tests/nimble_ext_adv/Makefile.ci rename to tests/pkg/nimble_ext_adv/Makefile.ci diff --git a/tests/nimble_ext_adv/main.c b/tests/pkg/nimble_ext_adv/main.c similarity index 100% rename from tests/nimble_ext_adv/main.c rename to tests/pkg/nimble_ext_adv/main.c diff --git a/tests/nimble_l2cap/Makefile b/tests/pkg/nimble_l2cap/Makefile similarity index 85% rename from tests/nimble_l2cap/Makefile rename to tests/pkg/nimble_l2cap/Makefile index 2333ef219d..c70502ca53 100644 --- a/tests/nimble_l2cap/Makefile +++ b/tests/pkg/nimble_l2cap/Makefile @@ -2,7 +2,7 @@ BOARD ?= nrf52dk # load the default test environment -include ../Makefile.tests_common +include ../Makefile.pkg_common # RIOT modules used in for this test USEMODULE += xtimer @@ -12,7 +12,7 @@ USEMODULE += ps USEMODULE += bluetil_ad # Get the shared NimBLE and test configuration from the backend server -include $(RIOTBASE)/tests/nimble_l2cap_server/nimble.inc.mk +include $(RIOTBASE)/tests/pkg/nimble_l2cap_server/nimble.inc.mk # Comment this out to disable code in RIOT that does safety checking # which is not needed in a production environment but helps in the diff --git a/tests/nimble_l2cap/Makefile.ci b/tests/pkg/nimble_l2cap/Makefile.ci similarity index 100% rename from tests/nimble_l2cap/Makefile.ci rename to tests/pkg/nimble_l2cap/Makefile.ci diff --git a/tests/nimble_l2cap/README.md b/tests/pkg/nimble_l2cap/README.md similarity index 100% rename from tests/nimble_l2cap/README.md rename to tests/pkg/nimble_l2cap/README.md diff --git a/tests/nimble_l2cap/main.c b/tests/pkg/nimble_l2cap/main.c similarity index 100% rename from tests/nimble_l2cap/main.c rename to tests/pkg/nimble_l2cap/main.c diff --git a/tests/nimble_l2cap_server/Makefile b/tests/pkg/nimble_l2cap_server/Makefile similarity index 84% rename from tests/nimble_l2cap_server/Makefile rename to tests/pkg/nimble_l2cap_server/Makefile index e36e9071d1..bfd740180c 100644 --- a/tests/nimble_l2cap_server/Makefile +++ b/tests/pkg/nimble_l2cap_server/Makefile @@ -2,14 +2,14 @@ BOARD ?= nrf52dk # load the default test environment -include ../Makefile.tests_common +include ../Makefile.pkg_common # RIOT modules used in for this test USEMODULE += xtimer USEMODULE += bluetil_ad # Get the shared NimBLE and test configuration from the backend server -include $(RIOTBASE)/tests/nimble_l2cap_server/nimble.inc.mk +include $(RIOTBASE)/tests/pkg/nimble_l2cap_server/nimble.inc.mk # Comment this out to disable code in RIOT that does safety checking # which is not needed in a production environment but helps in the diff --git a/tests/nimble_l2cap_server/Makefile.ci b/tests/pkg/nimble_l2cap_server/Makefile.ci similarity index 100% rename from tests/nimble_l2cap_server/Makefile.ci rename to tests/pkg/nimble_l2cap_server/Makefile.ci diff --git a/tests/nimble_l2cap_server/README.md b/tests/pkg/nimble_l2cap_server/README.md similarity index 100% rename from tests/nimble_l2cap_server/README.md rename to tests/pkg/nimble_l2cap_server/README.md diff --git a/tests/nimble_l2cap_server/include/nimble_l2cap_test_conf.h b/tests/pkg/nimble_l2cap_server/include/nimble_l2cap_test_conf.h similarity index 100% rename from tests/nimble_l2cap_server/include/nimble_l2cap_test_conf.h rename to tests/pkg/nimble_l2cap_server/include/nimble_l2cap_test_conf.h diff --git a/tests/nimble_l2cap_server/main.c b/tests/pkg/nimble_l2cap_server/main.c similarity index 100% rename from tests/nimble_l2cap_server/main.c rename to tests/pkg/nimble_l2cap_server/main.c diff --git a/tests/nimble_l2cap_server/nimble.inc.mk b/tests/pkg/nimble_l2cap_server/nimble.inc.mk similarity index 96% rename from tests/nimble_l2cap_server/nimble.inc.mk rename to tests/pkg/nimble_l2cap_server/nimble.inc.mk index ec1a7e5cd9..e00afed23b 100644 --- a/tests/nimble_l2cap_server/nimble.inc.mk +++ b/tests/pkg/nimble_l2cap_server/nimble.inc.mk @@ -43,4 +43,4 @@ CFLAGS += -DMYNEWT_VAL_BLE_L2CAP_COC_MPS=MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE CFLAGS += -DMYNEWT_VAL_MSYS_1_BLOCK_COUNT=$(MSYS_CNT) CFLAGS += -DMYNEWT_VAL_MSYS_1_BLOCK_SIZE="(MYNEWT_VAL_BLE_L2CAP_COC_MPS + 48)" -INCLUDES += -I$(RIOTBASE)/tests/nimble_l2cap_server/include +INCLUDES += -I$(RIOTBASE)/tests/pkg/nimble_l2cap_server/include diff --git a/tests/nimble_netif_ext/Makefile b/tests/pkg/nimble_netif_ext/Makefile similarity index 93% rename from tests/nimble_netif_ext/Makefile rename to tests/pkg/nimble_netif_ext/Makefile index 192467a01a..170d09c824 100644 --- a/tests/nimble_netif_ext/Makefile +++ b/tests/pkg/nimble_netif_ext/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_netif_ext/Makefile.ci b/tests/pkg/nimble_netif_ext/Makefile.ci similarity index 100% rename from tests/nimble_netif_ext/Makefile.ci rename to tests/pkg/nimble_netif_ext/Makefile.ci diff --git a/tests/nimble_netif_ext/main.c b/tests/pkg/nimble_netif_ext/main.c similarity index 100% rename from tests/nimble_netif_ext/main.c rename to tests/pkg/nimble_netif_ext/main.c diff --git a/tests/nimble_rpble_gnrc/Makefile b/tests/pkg/nimble_rpble_gnrc/Makefile similarity index 93% rename from tests/nimble_rpble_gnrc/Makefile rename to tests/pkg/nimble_rpble_gnrc/Makefile index 38cab4d31e..4fba5b1502 100644 --- a/tests/nimble_rpble_gnrc/Makefile +++ b/tests/pkg/nimble_rpble_gnrc/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_rpble_gnrc/Makefile.ci b/tests/pkg/nimble_rpble_gnrc/Makefile.ci similarity index 100% rename from tests/nimble_rpble_gnrc/Makefile.ci rename to tests/pkg/nimble_rpble_gnrc/Makefile.ci diff --git a/tests/nimble_rpble_gnrc/main.c b/tests/pkg/nimble_rpble_gnrc/main.c similarity index 100% rename from tests/nimble_rpble_gnrc/main.c rename to tests/pkg/nimble_rpble_gnrc/main.c diff --git a/tests/nimble_rpble_gnrc_ext/Makefile b/tests/pkg/nimble_rpble_gnrc_ext/Makefile similarity index 95% rename from tests/nimble_rpble_gnrc_ext/Makefile rename to tests/pkg/nimble_rpble_gnrc_ext/Makefile index 82406ac0fb..d4be2be71f 100644 --- a/tests/nimble_rpble_gnrc_ext/Makefile +++ b/tests/pkg/nimble_rpble_gnrc_ext/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell diff --git a/tests/nimble_rpble_gnrc_ext/Makefile.ci b/tests/pkg/nimble_rpble_gnrc_ext/Makefile.ci similarity index 100% rename from tests/nimble_rpble_gnrc_ext/Makefile.ci rename to tests/pkg/nimble_rpble_gnrc_ext/Makefile.ci diff --git a/tests/nimble_rpble_gnrc_ext/main.c b/tests/pkg/nimble_rpble_gnrc_ext/main.c similarity index 100% rename from tests/nimble_rpble_gnrc_ext/main.c rename to tests/pkg/nimble_rpble_gnrc_ext/main.c diff --git a/tests/nimble_statconn_gnrc/Makefile b/tests/pkg/nimble_statconn_gnrc/Makefile similarity index 92% rename from tests/nimble_statconn_gnrc/Makefile rename to tests/pkg/nimble_statconn_gnrc/Makefile index 83d68a3c63..043d8034cd 100644 --- a/tests/nimble_statconn_gnrc/Makefile +++ b/tests/pkg/nimble_statconn_gnrc/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell_cmds_default diff --git a/tests/nimble_statconn_gnrc/Makefile.ci b/tests/pkg/nimble_statconn_gnrc/Makefile.ci similarity index 100% rename from tests/nimble_statconn_gnrc/Makefile.ci rename to tests/pkg/nimble_statconn_gnrc/Makefile.ci diff --git a/tests/nimble_statconn_gnrc/main.c b/tests/pkg/nimble_statconn_gnrc/main.c similarity index 100% rename from tests/nimble_statconn_gnrc/main.c rename to tests/pkg/nimble_statconn_gnrc/main.c diff --git a/tests/nimble_statconn_gnrc_ext/Makefile b/tests/pkg/nimble_statconn_gnrc_ext/Makefile similarity index 93% rename from tests/nimble_statconn_gnrc_ext/Makefile rename to tests/pkg/nimble_statconn_gnrc_ext/Makefile index 728c93549b..1e6548dcea 100644 --- a/tests/nimble_statconn_gnrc_ext/Makefile +++ b/tests/pkg/nimble_statconn_gnrc_ext/Makefile @@ -1,5 +1,5 @@ BOARD ?= nrf52dk -include ../Makefile.tests_common +include ../Makefile.pkg_common # include shell support USEMODULE += shell_cmds_default diff --git a/tests/nimble_statconn_gnrc_ext/Makefile.ci b/tests/pkg/nimble_statconn_gnrc_ext/Makefile.ci similarity index 100% rename from tests/nimble_statconn_gnrc_ext/Makefile.ci rename to tests/pkg/nimble_statconn_gnrc_ext/Makefile.ci diff --git a/tests/nimble_statconn_gnrc_ext/main.c b/tests/pkg/nimble_statconn_gnrc_ext/main.c similarity index 100% rename from tests/nimble_statconn_gnrc_ext/main.c rename to tests/pkg/nimble_statconn_gnrc_ext/main.c