Merge #19567

19567: tests: move build system applications to tests/build_system r=aabadie a=aabadie Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
RIOT-OS · May 11, 2023 · 4af0376 · 4af0376
2 parents d362a8d + b8001f4
commit 4af0376
Show file tree

Hide file tree

Showing 164 changed files with 19 additions and 16 deletions.
diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh
@@ -261,7 +261,7 @@ checks_tests_application_not_defined_in_makefile() {
     patterns+=(-e '^[[:space:]]*APPLICATION[[:space:]:+]=')
 
     pathspec+=('tests/**/Makefile')
-    pathspec+=(':!tests/external_board_native/Makefile')
+    pathspec+=(':!tests/build_system/external_board_native/Makefile')
 
     git -C "${RIOTBASE}" grep -n "${patterns[@]}" -- "${pathspec[@]}" \
         | error_with_message "Don't define APPLICATION in test Makefile"

diff --git a/makefiles/app_dirs.inc.mk b/makefiles/app_dirs.inc.mk
@@ -15,6 +15,7 @@ APPLICATION_DIRS :=                   \
     examples                          \
     tests                             \
     tests/bench                       \
+    tests/build_system                \
     tests/core                        \
     tests/drivers                     \
     tests/periph                      \

diff --git a/tests/build_system/Makefile.build_system_common b/tests/build_system/Makefile.build_system_common
@@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common
diff --git a/tests/blob/Makefile → tests/build_system/blob/Makefile b/tests/blob/Makefile → tests/build_system/blob/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 USEMODULE += fmt
 

diff --git a/tests/blob/blob_module/Makefile → tests/build_system/blob/blob_module/Makefile b/tests/blob/blob_module/Makefile → tests/build_system/blob/blob_module/Makefile
diff --git a/tests/blob/blob_module/blob.c → tests/build_system/blob/blob_module/blob.c b/tests/blob/blob_module/blob.c → tests/build_system/blob/blob_module/blob.c
diff --git a/tests/blob/blob_module/blobtest.bin → ...uild_system/blob/blob_module/blobtest.bin b/tests/blob/blob_module/blobtest.bin → ...uild_system/blob/blob_module/blobtest.bin
diff --git a/tests/blob/blob_subdir/blobtest_subdir.txt → ...stem/blob/blob_subdir/blobtest_subdir.txt b/tests/blob/blob_subdir/blobtest_subdir.txt → ...stem/blob/blob_subdir/blobtest_subdir.txt
diff --git a/tests/blob/blobtest.txt → tests/build_system/blob/blobtest.txt b/tests/blob/blobtest.txt → tests/build_system/blob/blobtest.txt
diff --git a/tests/blob/main.c → tests/build_system/blob/main.c b/tests/blob/main.c → tests/build_system/blob/main.c
diff --git a/tests/blob/tests/01-run.py → tests/build_system/blob/tests/01-run.py b/tests/blob/tests/01-run.py → tests/build_system/blob/tests/01-run.py
diff --git a/tests/build_system_cflags_spaces/Makefile → tests/build_system/cflags_spaces/Makefile b/tests/build_system_cflags_spaces/Makefile → tests/build_system/cflags_spaces/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 CFLAGS += -DSUPER_STRING='"I love sentences with spaces"'
 
 include $(RIOTBASE)/Makefile.include

diff --git a/tests/build_system_cflags_spaces/README.md → tests/build_system/cflags_spaces/README.md b/tests/build_system_cflags_spaces/README.md → tests/build_system/cflags_spaces/README.md
diff --git a/tests/build_system_cflags_spaces/main.c → tests/build_system/cflags_spaces/main.c b/tests/build_system_cflags_spaces/main.c → tests/build_system/cflags_spaces/main.c
diff --git a/...uild_system_cflags_spaces/tests/01-run.py → ...uild_system/cflags_spaces/tests/01-run.py b/...uild_system_cflags_spaces/tests/01-run.py → ...uild_system/cflags_spaces/tests/01-run.py
diff --git a/tests/cortexm_common_ldscript/Makefile → ...d_system/cortexm_common_ldscript/Makefile b/tests/cortexm_common_ldscript/Makefile → ...d_system/cortexm_common_ldscript/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= samr21-xpro
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 
 # Normally all boards using `cortexm_common/ldscripts/cortexm.ld` linkerscript

diff --git a/tests/cortexm_common_ldscript/Makefile.ci → ...ystem/cortexm_common_ldscript/Makefile.ci b/tests/cortexm_common_ldscript/Makefile.ci → ...ystem/cortexm_common_ldscript/Makefile.ci
diff --git a/tests/cortexm_common_ldscript/README.md → ..._system/cortexm_common_ldscript/README.md b/tests/cortexm_common_ldscript/README.md → ..._system/cortexm_common_ldscript/README.md
diff --git a/tests/build_system_utils/main.c → ...ild_system/cortexm_common_ldscript/main.c b/tests/build_system_utils/main.c → ...ild_system/cortexm_common_ldscript/main.c
diff --git a/tests/cpp_exclude/Makefile → tests/build_system/cpp_exclude/Makefile b/tests/cpp_exclude/Makefile → tests/build_system/cpp_exclude/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 FEATURES_REQUIRED += cpp libstdcpp
 

diff --git a/tests/cpp_exclude/Makefile.ci → tests/build_system/cpp_exclude/Makefile.ci b/tests/cpp_exclude/Makefile.ci → tests/build_system/cpp_exclude/Makefile.ci
diff --git a/tests/cpp_exclude/app.config.test → .../build_system/cpp_exclude/app.config.test b/tests/cpp_exclude/app.config.test → .../build_system/cpp_exclude/app.config.test
diff --git a/...e/external_modules/module_exclude/Kconfig → ...e/external_modules/module_exclude/Kconfig b/...e/external_modules/module_exclude/Kconfig → ...e/external_modules/module_exclude/Kconfig
diff --git a/.../external_modules/module_exclude/Makefile → .../external_modules/module_exclude/Makefile b/.../external_modules/module_exclude/Makefile → .../external_modules/module_exclude/Makefile
diff --git a/...ernal_modules/module_exclude/Makefile.dep → ...ernal_modules/module_exclude/Makefile.dep b/...ernal_modules/module_exclude/Makefile.dep → ...ernal_modules/module_exclude/Makefile.dep
diff --git a/...l_modules/module_exclude/Makefile.include → ...l_modules/module_exclude/Makefile.include b/...l_modules/module_exclude/Makefile.include → ...l_modules/module_exclude/Makefile.include
diff --git a/...xternal_modules/module_exclude/module.cpp → ...xternal_modules/module_exclude/module.cpp b/...xternal_modules/module_exclude/module.cpp → ...xternal_modules/module_exclude/module.cpp
diff --git a/...xternal_modules/module_exclude/module.hpp → ...xternal_modules/module_exclude/module.hpp b/...xternal_modules/module_exclude/module.hpp → ...xternal_modules/module_exclude/module.hpp
diff --git a/...odules/module_exclude/module_excluded.cpp → ...odules/module_exclude/module_excluded.cpp b/...odules/module_exclude/module_excluded.cpp → ...odules/module_exclude/module_excluded.cpp
diff --git a/tests/cpp_exclude/main.cpp → tests/build_system/cpp_exclude/main.cpp b/tests/cpp_exclude/main.cpp → tests/build_system/cpp_exclude/main.cpp
diff --git a/tests/cpp_exclude/tests/01-run.py → .../build_system/cpp_exclude/tests/01-run.py b/tests/cpp_exclude/tests/01-run.py → .../build_system/cpp_exclude/tests/01-run.py
diff --git a/tests/cpp_ext/Makefile → tests/build_system/cpp_ext/Makefile b/tests/cpp_ext/Makefile → tests/build_system/cpp_ext/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 FEATURES_REQUIRED += cpp libstdcpp
 

diff --git a/tests/cpp_ext/Makefile.ci → tests/build_system/cpp_ext/Makefile.ci b/tests/cpp_ext/Makefile.ci → tests/build_system/cpp_ext/Makefile.ci
diff --git a/tests/cpp_ext/app.config.test → tests/build_system/cpp_ext/app.config.test b/tests/cpp_ext/app.config.test → tests/build_system/cpp_ext/app.config.test
diff --git a/...s/cpp_ext/external_modules/module/Kconfig → ...m/cpp_ext/external_modules/module/Kconfig b/...s/cpp_ext/external_modules/module/Kconfig → ...m/cpp_ext/external_modules/module/Kconfig
diff --git a/.../cpp_ext/external_modules/module/Makefile → .../cpp_ext/external_modules/module/Makefile b/.../cpp_ext/external_modules/module/Makefile → .../cpp_ext/external_modules/module/Makefile
diff --git a/..._ext/external_modules/module/Makefile.dep → ..._ext/external_modules/module/Makefile.dep b/..._ext/external_modules/module/Makefile.dep → ..._ext/external_modules/module/Makefile.dep
diff --git a/.../external_modules/module/Makefile.include → .../external_modules/module/Makefile.include b/.../external_modules/module/Makefile.include → .../external_modules/module/Makefile.include
diff --git a/...cpp_ext/external_modules/module/module.cc → ...cpp_ext/external_modules/module/module.cc b/...cpp_ext/external_modules/module/module.cc → ...cpp_ext/external_modules/module/module.cc
diff --git a/...pp_ext/external_modules/module/module.cpp → ...pp_ext/external_modules/module/module.cpp b/...pp_ext/external_modules/module/module.cpp → ...pp_ext/external_modules/module/module.cpp
diff --git a/...cpp_ext/external_modules/module/module.hh → ...cpp_ext/external_modules/module/module.hh b/...cpp_ext/external_modules/module/module.hh → ...cpp_ext/external_modules/module/module.hh
diff --git a/tests/cpp_ext/main.cpp → tests/build_system/cpp_ext/main.cpp b/tests/cpp_ext/main.cpp → tests/build_system/cpp_ext/main.cpp
diff --git a/tests/cpp_ext/tests/01-run.py → tests/build_system/cpp_ext/tests/01-run.py b/tests/cpp_ext/tests/01-run.py → tests/build_system/cpp_ext/tests/01-run.py
diff --git a/tests/external_board_dirs/Makefile → ...build_system/external_board_dirs/Makefile b/tests/external_board_dirs/Makefile → ...build_system/external_board_dirs/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 # Require arch_native feature so this is not compiled for other boards in
 # $(RIOTBOARD)/

diff --git a/tests/external_board_dirs/README.md → ...uild_system/external_board_dirs/README.md b/tests/external_board_dirs/README.md → ...uild_system/external_board_dirs/README.md
diff --git a/...board_dirs/esp-ci-boards/esp32-ci/Kconfig → ...board_dirs/esp-ci-boards/esp32-ci/Kconfig b/...board_dirs/esp-ci-boards/esp32-ci/Kconfig → ...board_dirs/esp-ci-boards/esp32-ci/Kconfig
diff --git a/...oard_dirs/esp-ci-boards/esp32-ci/Makefile → ...oard_dirs/esp-ci-boards/esp32-ci/Makefile b/...oard_dirs/esp-ci-boards/esp32-ci/Makefile → ...oard_dirs/esp-ci-boards/esp32-ci/Makefile
diff --git a/..._dirs/esp-ci-boards/esp32-ci/Makefile.dep → ..._dirs/esp-ci-boards/esp32-ci/Makefile.dep b/..._dirs/esp-ci-boards/esp32-ci/Makefile.dep → ..._dirs/esp-ci-boards/esp32-ci/Makefile.dep
diff --git a/.../esp-ci-boards/esp32-ci/Makefile.features → .../esp-ci-boards/esp32-ci/Makefile.features b/.../esp-ci-boards/esp32-ci/Makefile.features → .../esp-ci-boards/esp32-ci/Makefile.features
diff --git a/...s/esp-ci-boards/esp32-ci/Makefile.include → ...s/esp-ci-boards/esp32-ci/Makefile.include b/...s/esp-ci-boards/esp32-ci/Makefile.include → ...s/esp-ci-boards/esp32-ci/Makefile.include
diff --git a/...rs/esp-ci-boards/esp32-ci/esp32-ci.config → ...rs/esp-ci-boards/esp32-ci/esp32-ci.config b/...rs/esp-ci-boards/esp32-ci/esp32-ci.config → ...rs/esp-ci-boards/esp32-ci/esp32-ci.config
diff --git a/...ard_dirs/esp-ci-boards/esp32c3-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32c3-ci/Kconfig b/...ard_dirs/esp-ci-boards/esp32c3-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32c3-ci/Kconfig
diff --git a/...rd_dirs/esp-ci-boards/esp32c3-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32c3-ci/Makefile b/...rd_dirs/esp-ci-boards/esp32c3-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32c3-ci/Makefile
diff --git a/...irs/esp-ci-boards/esp32c3-ci/Makefile.dep → ...irs/esp-ci-boards/esp32c3-ci/Makefile.dep b/...irs/esp-ci-boards/esp32c3-ci/Makefile.dep → ...irs/esp-ci-boards/esp32c3-ci/Makefile.dep
diff --git a/...sp-ci-boards/esp32c3-ci/Makefile.features → ...sp-ci-boards/esp32c3-ci/Makefile.features b/...sp-ci-boards/esp32c3-ci/Makefile.features → ...sp-ci-boards/esp32c3-ci/Makefile.features
diff --git a/...esp-ci-boards/esp32c3-ci/Makefile.include → ...esp-ci-boards/esp32c3-ci/Makefile.include b/...esp-ci-boards/esp32c3-ci/Makefile.include → ...esp-ci-boards/esp32c3-ci/Makefile.include
diff --git a/...sp-ci-boards/esp32c3-ci/esp32c3-ci.config → ...sp-ci-boards/esp32c3-ci/esp32c3-ci.config b/...sp-ci-boards/esp32c3-ci/esp32c3-ci.config → ...sp-ci-boards/esp32c3-ci/esp32c3-ci.config
diff --git a/...ard_dirs/esp-ci-boards/esp32s2-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32s2-ci/Kconfig b/...ard_dirs/esp-ci-boards/esp32s2-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32s2-ci/Kconfig
diff --git a/...rd_dirs/esp-ci-boards/esp32s2-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32s2-ci/Makefile b/...rd_dirs/esp-ci-boards/esp32s2-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32s2-ci/Makefile
diff --git a/...irs/esp-ci-boards/esp32s2-ci/Makefile.dep → ...irs/esp-ci-boards/esp32s2-ci/Makefile.dep b/...irs/esp-ci-boards/esp32s2-ci/Makefile.dep → ...irs/esp-ci-boards/esp32s2-ci/Makefile.dep
diff --git a/...sp-ci-boards/esp32s2-ci/Makefile.features → ...sp-ci-boards/esp32s2-ci/Makefile.features b/...sp-ci-boards/esp32s2-ci/Makefile.features → ...sp-ci-boards/esp32s2-ci/Makefile.features
diff --git a/...esp-ci-boards/esp32s2-ci/Makefile.include → ...esp-ci-boards/esp32s2-ci/Makefile.include b/...esp-ci-boards/esp32s2-ci/Makefile.include → ...esp-ci-boards/esp32s2-ci/Makefile.include
diff --git a/...sp-ci-boards/esp32s2-ci/esp32s2-ci.config → ...sp-ci-boards/esp32s2-ci/esp32s2-ci.config b/...sp-ci-boards/esp32s2-ci/esp32s2-ci.config → ...sp-ci-boards/esp32s2-ci/esp32s2-ci.config
diff --git a/...ard_dirs/esp-ci-boards/esp32s3-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32s3-ci/Kconfig b/...ard_dirs/esp-ci-boards/esp32s3-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp32s3-ci/Kconfig
diff --git a/...rd_dirs/esp-ci-boards/esp32s3-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32s3-ci/Makefile b/...rd_dirs/esp-ci-boards/esp32s3-ci/Makefile → ...rd_dirs/esp-ci-boards/esp32s3-ci/Makefile
diff --git a/...irs/esp-ci-boards/esp32s3-ci/Makefile.dep → ...irs/esp-ci-boards/esp32s3-ci/Makefile.dep b/...irs/esp-ci-boards/esp32s3-ci/Makefile.dep → ...irs/esp-ci-boards/esp32s3-ci/Makefile.dep
diff --git a/...sp-ci-boards/esp32s3-ci/Makefile.features → ...sp-ci-boards/esp32s3-ci/Makefile.features b/...sp-ci-boards/esp32s3-ci/Makefile.features → ...sp-ci-boards/esp32s3-ci/Makefile.features
diff --git a/...esp-ci-boards/esp32s3-ci/Makefile.include → ...esp-ci-boards/esp32s3-ci/Makefile.include b/...esp-ci-boards/esp32s3-ci/Makefile.include → ...esp-ci-boards/esp32s3-ci/Makefile.include
diff --git a/...sp-ci-boards/esp32s3-ci/esp32s3-ci.config → ...sp-ci-boards/esp32s3-ci/esp32s3-ci.config b/...sp-ci-boards/esp32s3-ci/esp32s3-ci.config → ...sp-ci-boards/esp32s3-ci/esp32s3-ci.config
diff --git a/...ard_dirs/esp-ci-boards/esp8266-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp8266-ci/Kconfig b/...ard_dirs/esp-ci-boards/esp8266-ci/Kconfig → ...ard_dirs/esp-ci-boards/esp8266-ci/Kconfig
diff --git a/...rd_dirs/esp-ci-boards/esp8266-ci/Makefile → ...rd_dirs/esp-ci-boards/esp8266-ci/Makefile b/...rd_dirs/esp-ci-boards/esp8266-ci/Makefile → ...rd_dirs/esp-ci-boards/esp8266-ci/Makefile
diff --git a/...irs/esp-ci-boards/esp8266-ci/Makefile.dep → ...irs/esp-ci-boards/esp8266-ci/Makefile.dep b/...irs/esp-ci-boards/esp8266-ci/Makefile.dep → ...irs/esp-ci-boards/esp8266-ci/Makefile.dep
diff --git a/...sp-ci-boards/esp8266-ci/Makefile.features → ...sp-ci-boards/esp8266-ci/Makefile.features b/...sp-ci-boards/esp8266-ci/Makefile.features → ...sp-ci-boards/esp8266-ci/Makefile.features
diff --git a/...esp-ci-boards/esp8266-ci/Makefile.include → ...esp-ci-boards/esp8266-ci/Makefile.include b/...esp-ci-boards/esp8266-ci/Makefile.include → ...esp-ci-boards/esp8266-ci/Makefile.include
diff --git a/...sp-ci-boards/esp8266-ci/esp8266-ci.config → ...sp-ci-boards/esp8266-ci/esp8266-ci.config b/...sp-ci-boards/esp8266-ci/esp8266-ci.config → ...sp-ci-boards/esp8266-ci/esp8266-ci.config
diff --git a/...l_board_dirs/external_board_dir_1/native1 → ...l_board_dirs/external_board_dir_1/native1 b/...l_board_dirs/external_board_dir_1/native1 → ...l_board_dirs/external_board_dir_1/native1
diff --git a/...l_board_dirs/external_board_dir_2/native2 → ...l_board_dirs/external_board_dir_2/native2 b/...l_board_dirs/external_board_dir_2/native2 → ...l_board_dirs/external_board_dir_2/native2
diff --git a/tests/external_board_dirs/main.c → ...s/build_system/external_board_dirs/main.c b/tests/external_board_dirs/main.c → ...s/build_system/external_board_dirs/main.c
diff --git a/.../netdev-ci-boards/nrf52840-ci-eth/Kconfig → .../netdev-ci-boards/nrf52840-ci-eth/Kconfig b/.../netdev-ci-boards/nrf52840-ci-eth/Kconfig → .../netdev-ci-boards/nrf52840-ci-eth/Kconfig
diff --git a/...netdev-ci-boards/nrf52840-ci-eth/Makefile → ...netdev-ci-boards/nrf52840-ci-eth/Makefile b/...netdev-ci-boards/nrf52840-ci-eth/Makefile → ...netdev-ci-boards/nrf52840-ci-eth/Makefile
diff --git a/...ev-ci-boards/nrf52840-ci-eth/Makefile.dep → ...ev-ci-boards/nrf52840-ci-eth/Makefile.dep b/...ev-ci-boards/nrf52840-ci-eth/Makefile.dep → ...ev-ci-boards/nrf52840-ci-eth/Makefile.dep
diff --git a/...-boards/nrf52840-ci-eth/Makefile.features → ...-boards/nrf52840-ci-eth/Makefile.features b/...-boards/nrf52840-ci-eth/Makefile.features → ...-boards/nrf52840-ci-eth/Makefile.features
diff --git a/...i-boards/nrf52840-ci-eth/Makefile.include → ...i-boards/nrf52840-ci-eth/Makefile.include b/...i-boards/nrf52840-ci-eth/Makefile.include → ...i-boards/nrf52840-ci-eth/Makefile.include
diff --git a/...ci-boards/nrf52840-ci-ieee802154/Makefile → ...ci-boards/nrf52840-ci-ieee802154/Makefile b/...ci-boards/nrf52840-ci-ieee802154/Makefile → ...ci-boards/nrf52840-ci-ieee802154/Makefile
diff --git a/...oards/nrf52840-ci-ieee802154/Makefile.dep → ...oards/nrf52840-ci-ieee802154/Makefile.dep b/...oards/nrf52840-ci-ieee802154/Makefile.dep → ...oards/nrf52840-ci-ieee802154/Makefile.dep
diff --git a/.../nrf52840-ci-ieee802154/Makefile.features → .../nrf52840-ci-ieee802154/Makefile.features b/.../nrf52840-ci-ieee802154/Makefile.features → .../nrf52840-ci-ieee802154/Makefile.features
diff --git a/...s/nrf52840-ci-ieee802154/Makefile.include → ...s/nrf52840-ci-ieee802154/Makefile.include b/...s/nrf52840-ci-ieee802154/Makefile.include → ...s/nrf52840-ci-ieee802154/Makefile.include
diff --git a/tests/external_board_native/Makefile → ...ild_system/external_board_native/Makefile b/tests/external_board_native/Makefile → ...ild_system/external_board_native/Makefile
@@ -1,5 +1,5 @@
 APPLICATION = external_board
-RIOTBASE ?= $(CURDIR)/../../
+RIOTBASE ?= $(CURDIR)/../../../
 
 # Only support this board
 # No need for a `WHITELIST` as there is only one board in `external_boards`.

diff --git a/tests/external_board_native/README.md → ...ld_system/external_board_native/README.md b/tests/external_board_native/README.md → ...ld_system/external_board_native/README.md
diff --git a/...rd_native/external_boards/native/Makefile → ...rd_native/external_boards/native/Makefile b/...rd_native/external_boards/native/Makefile → ...rd_native/external_boards/native/Makefile
diff --git a/...ative/external_boards/native/Makefile.dep → ...ative/external_boards/native/Makefile.dep b/...ative/external_boards/native/Makefile.dep → ...ative/external_boards/native/Makefile.dep
diff --git a/.../external_boards/native/Makefile.features → .../external_boards/native/Makefile.features b/.../external_boards/native/Makefile.features → .../external_boards/native/Makefile.features
diff --git a/...e/external_boards/native/Makefile.include → ...e/external_boards/native/Makefile.include b/...e/external_boards/native/Makefile.include → ...e/external_boards/native/Makefile.include
diff --git a/.../external_boards/native/external_native.c → .../external_boards/native/external_native.c b/.../external_boards/native/external_native.c → .../external_boards/native/external_native.c
diff --git a/...l_boards/native/include/external_native.h → ...l_boards/native/include/external_native.h b/...l_boards/native/include/external_native.h → ...l_boards/native/include/external_native.h
diff --git a/tests/external_board_native/main.c → ...build_system/external_board_native/main.c b/tests/external_board_native/main.c → ...build_system/external_board_native/main.c
diff --git a/tests/external_board_native/tests/01-run.py → ...tem/external_board_native/tests/01-run.py b/tests/external_board_native/tests/01-run.py → ...tem/external_board_native/tests/01-run.py
diff --git a/tests/external_module_dirs/Makefile → ...uild_system/external_module_dirs/Makefile b/tests/external_module_dirs/Makefile → ...uild_system/external_module_dirs/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 USEMODULE += random
 
 USEMODULE += external_module

diff --git a/tests/external_module_dirs/README.md → ...ild_system/external_module_dirs/README.md b/tests/external_module_dirs/README.md → ...ild_system/external_module_dirs/README.md
diff --git a/...external_modules/external_module/Makefile → ...external_modules/external_module/Makefile b/...external_modules/external_module/Makefile → ...external_modules/external_module/Makefile
diff --git a/...rnal_modules/external_module/Makefile.dep → ...rnal_modules/external_module/Makefile.dep b/...rnal_modules/external_module/Makefile.dep → ...rnal_modules/external_module/Makefile.dep
diff --git a/..._modules/external_module/Makefile.include → ..._modules/external_module/Makefile.include b/..._modules/external_module/Makefile.include → ..._modules/external_module/Makefile.include
diff --git a/...modules/external_module/external_module.c → ...modules/external_module/external_module.c b/...modules/external_module/external_module.c → ...modules/external_module/external_module.c
diff --git a/...external_module/include/external_module.h → ...external_module/include/external_module.h b/...external_module/include/external_module.h → ...external_module/include/external_module.h
diff --git a/...modules/external_module_not_used/Makefile → ...modules/external_module_not_used/Makefile b/...modules/external_module_not_used/Makefile → ...modules/external_module_not_used/Makefile
diff --git a/...module_not_used/this_should_not_compile.c → ...module_not_used/this_should_not_compile.c b/...module_not_used/this_should_not_compile.c → ...module_not_used/this_should_not_compile.c
diff --git a/tests/external_module_dirs/main.c → .../build_system/external_module_dirs/main.c b/tests/external_module_dirs/main.c → .../build_system/external_module_dirs/main.c
diff --git a/tests/external_pkg_dirs/Makefile → ...s/build_system/external_pkg_dirs/Makefile b/tests/external_pkg_dirs/Makefile → ...s/build_system/external_pkg_dirs/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 EXTERNAL_PKG_DIRS += external_pkgs
 USEPKG += external_pkg

diff --git a/tests/external_pkg_dirs/README.md → .../build_system/external_pkg_dirs/README.md b/tests/external_pkg_dirs/README.md → .../build_system/external_pkg_dirs/README.md
diff --git a/tests/external_pkg_dirs/app.config.test → ..._system/external_pkg_dirs/app.config.test b/tests/external_pkg_dirs/app.config.test → ..._system/external_pkg_dirs/app.config.test
diff --git a/...g_dirs/external_pkgs/external_pkg/Kconfig → ...g_dirs/external_pkgs/external_pkg/Kconfig b/...g_dirs/external_pkgs/external_pkg/Kconfig → ...g_dirs/external_pkgs/external_pkg/Kconfig
diff --git a/..._dirs/external_pkgs/external_pkg/Makefile → ..._dirs/external_pkgs/external_pkg/Makefile b/..._dirs/external_pkgs/external_pkg/Makefile → ..._dirs/external_pkgs/external_pkg/Makefile
diff --git a/...ternal_pkgs/external_pkg/Makefile.include → ...ternal_pkgs/external_pkg/Makefile.include b/...ternal_pkgs/external_pkg/Makefile.include → ...ternal_pkgs/external_pkg/Makefile.include
diff --git a/...ternal_pkgs/external_pkg_not_used/Kconfig → ...ternal_pkgs/external_pkg_not_used/Kconfig b/...ternal_pkgs/external_pkg_not_used/Kconfig → ...ternal_pkgs/external_pkg_not_used/Kconfig
diff --git a/...ernal_pkgs/external_pkg_not_used/Makefile → ...ernal_pkgs/external_pkg_not_used/Makefile b/...ernal_pkgs/external_pkg_not_used/Makefile → ...ernal_pkgs/external_pkg_not_used/Makefile
diff --git a/...gs/external_pkg_not_used/Makefile.include → ...gs/external_pkg_not_used/Makefile.include b/...gs/external_pkg_not_used/Makefile.include → ...gs/external_pkg_not_used/Makefile.include
diff --git a/tests/external_pkg_dirs/main.c → tests/build_system/external_pkg_dirs/main.c b/tests/external_pkg_dirs/main.c → tests/build_system/external_pkg_dirs/main.c
diff --git a/tests/kconfig/Kconfig → tests/build_system/kconfig/Kconfig b/tests/kconfig/Kconfig → tests/build_system/kconfig/Kconfig
diff --git a/tests/kconfig/Makefile → tests/build_system/kconfig/Makefile b/tests/kconfig/Makefile → tests/build_system/kconfig/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 USEMODULE += external_module_1
 USEMODULE += external_module_2

diff --git a/tests/kconfig/README.md → tests/build_system/kconfig/README.md b/tests/kconfig/README.md → tests/build_system/kconfig/README.md
diff --git a/tests/kconfig/app.config → tests/build_system/kconfig/app.config b/tests/kconfig/app.config → tests/build_system/kconfig/app.config
diff --git a/tests/kconfig/app.config.test → tests/build_system/kconfig/app.config.test b/tests/kconfig/app.config.test → tests/build_system/kconfig/app.config.test
diff --git a/tests/kconfig/app.h → tests/build_system/kconfig/app.h b/tests/kconfig/app.h → tests/build_system/kconfig/app.h
diff --git a/...xternal_modules/external_module_1/Kconfig → ...xternal_modules/external_module_1/Kconfig b/...xternal_modules/external_module_1/Kconfig → ...xternal_modules/external_module_1/Kconfig
diff --git a/...ternal_modules/external_module_1/Makefile → ...ternal_modules/external_module_1/Makefile b/...ternal_modules/external_module_1/Makefile → ...ternal_modules/external_module_1/Makefile
diff --git a/...odules/external_module_1/Makefile.include → ...odules/external_module_1/Makefile.include b/...odules/external_module_1/Makefile.include → ...odules/external_module_1/Makefile.include
diff --git a/...rnal_module_1/include/external_module_1.h → ...rnal_module_1/include/external_module_1.h b/...rnal_module_1/include/external_module_1.h → ...rnal_module_1/include/external_module_1.h
diff --git a/...xternal_modules/external_module_2/Kconfig → ...xternal_modules/external_module_2/Kconfig b/...xternal_modules/external_module_2/Kconfig → ...xternal_modules/external_module_2/Kconfig
diff --git a/...ternal_modules/external_module_2/Makefile → ...ternal_modules/external_module_2/Makefile b/...ternal_modules/external_module_2/Makefile → ...ternal_modules/external_module_2/Makefile
diff --git a/...odules/external_module_2/Makefile.include → ...odules/external_module_2/Makefile.include b/...odules/external_module_2/Makefile.include → ...odules/external_module_2/Makefile.include
diff --git a/...rnal_module_2/include/external_module_2.h → ...rnal_module_2/include/external_module_2.h b/...rnal_module_2/include/external_module_2.h → ...rnal_module_2/include/external_module_2.h
diff --git a/...nfig/external_pkgs/external_pkg_1/Kconfig → ...nfig/external_pkgs/external_pkg_1/Kconfig b/...nfig/external_pkgs/external_pkg_1/Kconfig → ...nfig/external_pkgs/external_pkg_1/Kconfig
diff --git a/...fig/external_pkgs/external_pkg_1/Makefile → ...fig/external_pkgs/external_pkg_1/Makefile b/...fig/external_pkgs/external_pkg_1/Makefile → ...fig/external_pkgs/external_pkg_1/Makefile
diff --git a/...rnal_pkgs/external_pkg_1/Makefile.include → ...rnal_pkgs/external_pkg_1/Makefile.include b/...rnal_pkgs/external_pkg_1/Makefile.include → ...rnal_pkgs/external_pkg_1/Makefile.include
diff --git a/...s/external_pkg_1/include/external_pkg_1.h → ...s/external_pkg_1/include/external_pkg_1.h b/...s/external_pkg_1/include/external_pkg_1.h → ...s/external_pkg_1/include/external_pkg_1.h
diff --git a/...nfig/external_pkgs/external_pkg_2/Kconfig → ...nfig/external_pkgs/external_pkg_2/Kconfig b/...nfig/external_pkgs/external_pkg_2/Kconfig → ...nfig/external_pkgs/external_pkg_2/Kconfig
diff --git a/...fig/external_pkgs/external_pkg_2/Makefile → ...fig/external_pkgs/external_pkg_2/Makefile b/...fig/external_pkgs/external_pkg_2/Makefile → ...fig/external_pkgs/external_pkg_2/Makefile
diff --git a/...rnal_pkgs/external_pkg_2/Makefile.include → ...rnal_pkgs/external_pkg_2/Makefile.include b/...rnal_pkgs/external_pkg_2/Makefile.include → ...rnal_pkgs/external_pkg_2/Makefile.include
diff --git a/...s/external_pkg_2/include/external_pkg_2.h → ...s/external_pkg_2/include/external_pkg_2.h b/...s/external_pkg_2/include/external_pkg_2.h → ...s/external_pkg_2/include/external_pkg_2.h
diff --git a/tests/kconfig/main.c → tests/build_system/kconfig/main.c b/tests/kconfig/main.c → tests/build_system/kconfig/main.c
diff --git a/tests/kconfig/tests/01-run.py → tests/build_system/kconfig/tests/01-run.py b/tests/kconfig/tests/01-run.py → tests/build_system/kconfig/tests/01-run.py
diff --git a/tests/kconfig_features/Kconfig → tests/build_system/kconfig_features/Kconfig b/tests/kconfig_features/Kconfig → tests/build_system/kconfig_features/Kconfig
diff --git a/tests/kconfig_features/Makefile → tests/build_system/kconfig_features/Makefile b/tests/kconfig_features/Makefile → tests/build_system/kconfig_features/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 all: checks
 

diff --git a/tests/kconfig_features/README.md → ...s/build_system/kconfig_features/README.md b/tests/kconfig_features/README.md → ...s/build_system/kconfig_features/README.md
diff --git a/tests/kconfig_features/main.c → tests/build_system/kconfig_features/main.c b/tests/kconfig_features/main.c → tests/build_system/kconfig_features/main.c
diff --git a/tests/test_tools/Makefile → tests/build_system/test_tools/Makefile b/tests/test_tools/Makefile → tests/build_system/test_tools/Makefile
@@ -1,5 +1,5 @@
 DEVELHELP = 0
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 USEMODULE += shell
 

diff --git a/tests/test_tools/Makefile.ci → tests/build_system/test_tools/Makefile.ci b/tests/test_tools/Makefile.ci → tests/build_system/test_tools/Makefile.ci
diff --git a/tests/test_tools/README.md → tests/build_system/test_tools/README.md b/tests/test_tools/README.md → tests/build_system/test_tools/README.md
diff --git a/tests/test_tools/app.config.test → ...s/build_system/test_tools/app.config.test b/tests/test_tools/app.config.test → ...s/build_system/test_tools/app.config.test
diff --git a/tests/test_tools/main.c → tests/build_system/test_tools/main.c b/tests/test_tools/main.c → tests/build_system/test_tools/main.c
diff --git a/tests/test_tools/tests/01-run.py → ...s/build_system/test_tools/tests/01-run.py b/tests/test_tools/tests/01-run.py → ...s/build_system/test_tools/tests/01-run.py
diff --git a/tests/build_system_utils/Makefile → tests/build_system/utils/Makefile b/tests/build_system_utils/Makefile → tests/build_system/utils/Makefile
@@ -1,6 +1,6 @@
 BOARD_WHITELIST = native
 
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 include $(RIOTBASE)/Makefile.include
 
 

diff --git a/tests/build_system_utils/README.md → tests/build_system/utils/README.md b/tests/build_system_utils/README.md → tests/build_system/utils/README.md
diff --git a/tests/cortexm_common_ldscript/main.c → tests/build_system/utils/main.c b/tests/cortexm_common_ldscript/main.c → tests/build_system/utils/main.c
diff --git a/tests/warn_conflict/Makefile → tests/build_system/warn_conflict/Makefile b/tests/warn_conflict/Makefile → tests/build_system/warn_conflict/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= stm32f4discovery
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 # The stm32f4discovery is the only board that provides known conflicting features,
 # so using this compile test on other boards will not provide the expected warning.

diff --git a/tests/warn_conflict/README.md → tests/build_system/warn_conflict/README.md b/tests/warn_conflict/README.md → tests/build_system/warn_conflict/README.md
diff --git a/tests/warn_conflict/main.c → tests/build_system/warn_conflict/main.c b/tests/warn_conflict/main.c → tests/build_system/warn_conflict/main.c
diff --git a/tests/warn_conflict/tests/01-make.py → ...ild_system/warn_conflict/tests/01-make.py b/tests/warn_conflict/tests/01-make.py → ...ild_system/warn_conflict/tests/01-make.py
diff --git a/tests/xfa/Makefile → tests/build_system/xfa/Makefile b/tests/xfa/Makefile → tests/build_system/xfa/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.build_system_common
 
 include $(RIOTBASE)/Makefile.include
 

diff --git a/tests/xfa/main.c → tests/build_system/xfa/main.c b/tests/xfa/main.c → tests/build_system/xfa/main.c
diff --git a/tests/xfa/tests/01-run.py → tests/build_system/xfa/tests/01-run.py b/tests/xfa/tests/01-run.py → tests/build_system/xfa/tests/01-run.py
diff --git a/tests/xfa/xfatest.h → tests/build_system/xfa/xfatest.h b/tests/xfa/xfatest.h → tests/build_system/xfa/xfatest.h
diff --git a/tests/xfa/xfatest1.c → tests/build_system/xfa/xfatest1.c b/tests/xfa/xfatest1.c → tests/build_system/xfa/xfatest1.c
diff --git a/tests/xfa/xfatest2.c → tests/build_system/xfa/xfatest2.c b/tests/xfa/xfatest2.c → tests/build_system/xfa/xfatest2.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		RIOTBASE ?= $(CURDIR)/../../..
		include $(CURDIR)/../../Makefile.tests_common