tests/bootloaders: group bootloader related applications

RIOT-OS · Nov 3, 2020 · 0b20ad5 · 0b20ad5
1 parent 8b883aa
commit 0b20ad5
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 4 deletions.
diff --git a/tests/mcuboot/Makefile → tests/bootloaders/mcuboot/Makefile b/tests/mcuboot/Makefile → tests/bootloaders/mcuboot/Makefile
@@ -1,6 +1,7 @@
 BOARD ?= nrf52dk
 
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 
 BOARD_WHITELIST := nrf52dk
 

diff --git a/tests/mcuboot/README.md → tests/bootloaders/mcuboot/README.md b/tests/mcuboot/README.md → tests/bootloaders/mcuboot/README.md
diff --git a/tests/mcuboot/main.c → tests/bootloaders/mcuboot/main.c b/tests/mcuboot/main.c → tests/bootloaders/mcuboot/main.c
diff --git a/tests/riotboot/Makefile → tests/bootloaders/riotboot/Makefile b/tests/riotboot/Makefile → tests/bootloaders/riotboot/Makefile
@@ -29,5 +29,6 @@ BUILD_FILES += $(SLOT_RIOT_ELFS:%.elf=%.bin)
 # submitted along with the test jobs.
 TEST_EXTRA_FILES=$(SLOT_RIOT_ELFS)
 
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/riotboot/Makefile.ci → tests/bootloaders/riotboot/Makefile.ci b/tests/riotboot/Makefile.ci → tests/bootloaders/riotboot/Makefile.ci
diff --git a/tests/riotboot/README.md → tests/bootloaders/riotboot/README.md b/tests/riotboot/README.md → tests/bootloaders/riotboot/README.md
diff --git a/tests/riotboot/main.c → tests/bootloaders/riotboot/main.c b/tests/riotboot/main.c → tests/bootloaders/riotboot/main.c
diff --git a/tests/riotboot/tests/01-run.py → tests/bootloaders/riotboot/tests/01-run.py b/tests/riotboot/tests/01-run.py → tests/bootloaders/riotboot/tests/01-run.py
diff --git a/tests/riotboot_flashwrite/Makefile → .../bootloaders/riotboot_flashwrite/Makefile b/tests/riotboot_flashwrite/Makefile → .../bootloaders/riotboot_flashwrite/Makefile
@@ -1,6 +1,7 @@
 DEVELHELP ?= 0
 BOARD ?= samr21-xpro
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_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/riotboot_flashwrite/Makefile.ci → ...otloaders/riotboot_flashwrite/Makefile.ci b/tests/riotboot_flashwrite/Makefile.ci → ...otloaders/riotboot_flashwrite/Makefile.ci
diff --git a/tests/riotboot_flashwrite/README.md → ...bootloaders/riotboot_flashwrite/README.md b/tests/riotboot_flashwrite/README.md → ...bootloaders/riotboot_flashwrite/README.md
diff --git a/tests/riotboot_flashwrite/coap_handler.c → ...oaders/riotboot_flashwrite/coap_handler.c b/tests/riotboot_flashwrite/coap_handler.c → ...oaders/riotboot_flashwrite/coap_handler.c
diff --git a/tests/riotboot_flashwrite/main.c → tests/bootloaders/riotboot_flashwrite/main.c b/tests/riotboot_flashwrite/main.c → tests/bootloaders/riotboot_flashwrite/main.c
diff --git a/tests/riotboot_hdr/Makefile → tests/bootloaders/riotboot_hdr/Makefile b/tests/riotboot_hdr/Makefile → tests/bootloaders/riotboot_hdr/Makefile
@@ -1,4 +1,5 @@
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 
 USEMODULE += riotboot_hdr
 USEMODULE += embunit

diff --git a/tests/riotboot_hdr/main.c → tests/bootloaders/riotboot_hdr/main.c b/tests/riotboot_hdr/main.c → tests/bootloaders/riotboot_hdr/main.c
diff --git a/tests/riotboot_hdr/tests/01-run.py → .../bootloaders/riotboot_hdr/tests/01-run.py b/tests/riotboot_hdr/tests/01-run.py → .../bootloaders/riotboot_hdr/tests/01-run.py