Merge #19484 #19565

19484: makefiles/arch/msp430.inc.mk: Fix compilation issues with GCC 12 r=maribu a=maribu ### Contribution description This fixes the following compilation issues: /home/maribu/Repos/software/RIOT/cpu/msp430fxyz/periph/gpio.c: In function 'gpio_periph_mode': /home/maribu/Repos/software/RIOT/cpu/msp430fxyz/periph/gpio.c:95:15: error: array subscript 0 is outside array bounds of 'msp_port_isr_t[0]' [-Werror=array-bounds] 95 | sel = &(isrport->SEL); | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors by adding `CFLAGS += --param-min-pagesize=0` for GCC 12 (same issue as already fixed for AVR). and: /usr/lib/gcc/msp430-elf/12.2.0/../../../../msp430-elf/bin/ld: warning: /home/maribu/Repos/software/RIOT/cpu/msp430_common/ldscripts/xfa.ld contains output sections; did you forget -T? by adding the missing `-T`. ### Testing procedure The following should still work: - `make BOARD=msb-430 -C examples/hello-world` - `make BOARD=msb-430 -C tests/xfa flash test` ### Issues/PRs references None 19565: tests: move core related applications to their own tests/core/ folder r=aabadie a=aabadie Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de> Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
RIOT-OS · May 10, 2023 · 754d4a3 · 754d4a3
3 parents c7f750a + b86366e + cabe02c
commit 754d4a3
Showing 168 changed files with 92 additions and 67 deletions.
diff --git a/cpu/msp430_common/ldscripts/riot-msp430f1611.ld b/cpu/msp430_common/ldscripts/riot-msp430f1611.ld
@@ -0,0 +1,3 @@
+INCLUDE msp430f1611.ld
+INCLUDE msp430_common.ld
+INCLUDE xfa.ld
diff --git a/cpu/msp430_common/ldscripts/riot-msp430f1612.ld b/cpu/msp430_common/ldscripts/riot-msp430f1612.ld
@@ -0,0 +1,3 @@
+INCLUDE msp430f1612.ld
+INCLUDE msp430_common.ld
+INCLUDE xfa.ld
diff --git a/cpu/msp430_common/ldscripts/riot-msp430f1617.ld b/cpu/msp430_common/ldscripts/riot-msp430f1617.ld
@@ -0,0 +1,3 @@
+INCLUDE msp430f1617.ld
+INCLUDE msp430_common.ld
+INCLUDE xfa.ld
diff --git a/cpu/msp430_common/ldscripts/riot-msp430f2617.ld b/cpu/msp430_common/ldscripts/riot-msp430f2617.ld
@@ -0,0 +1,3 @@
+INCLUDE msp430f2617.ld
+INCLUDE msp430_common.ld
+INCLUDE xfa.ld
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/core                        \
     tests/drivers                     \
     tests/periph                      \
     tests/pkg                         \

diff --git a/makefiles/arch/avr8.inc.mk b/makefiles/arch/avr8.inc.mk
@@ -41,10 +41,3 @@ endif
 OPTIONAL_CFLAGS_BLACKLIST += -Wformat-overflow
 OPTIONAL_CFLAGS_BLACKLIST += -Wformat-truncation
 OPTIONAL_CFLAGS_BLACKLIST += -gz
-
-ifeq ($(TOOLCHAIN),gnu)
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-  ifneq ($(findstring 12.,$(shell $(TARGET_ARCH)-gcc --version 2>/dev/null)),)
-    CFLAGS += --param=min-pagesize=0
-  endif
-endif
diff --git a/makefiles/arch/msp430.inc.mk b/makefiles/arch/msp430.inc.mk
@@ -13,11 +13,21 @@ CFLAGS_OPT  ?= -Os
 CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_DBG) $(CFLAGS_OPT)
 ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DBG)
 
+BINUTILS_VERSION := $(shell $(PREFIX)ld --version | grep -Eo '[0-9]\.[0-9]+')
+NEEDS_NEW_LINKER_SCRIPT := $(call version_is_greater_or_equal,$(BINUTILS_VERSION),2.40)
+
 LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT)
-LINKFLAGS += -Wl,--gc-sections -Wl,-L$(MSP430_SUPPORT_FILES)/include
-LINKFLAGS += -T $(MSP430_SUPPORT_FILES)/include/$(CPU_MODEL).ld
-LINKFLAGS += -T $(RIOTCPU)/msp430_common/ldscripts/msp430_common.ld
-LINKFLAGS += $(RIOTCPU)/msp430_common/ldscripts/xfa.ld
+LINKFLAGS += -Wl,--gc-sections
+LINKFLAGS += -Wl,-L$(MSP430_SUPPORT_FILES)/include
+LINKFLAGS += -Wl,-L$(RIOTCPU)/msp430_common/ldscripts
+
+ifeq (1,$(NEEDS_NEW_LINKER_SCRIPT))
+  LINKFLAGS += -T riot-$(CPU_MODEL).ld
+else
+  LINKFLAGS += -T $(MSP430_SUPPORT_FILES)/include/$(CPU_MODEL).ld
+  LINKFLAGS += -T $(RIOTCPU)/msp430_common/ldscripts/msp430_common.ld
+  LINKFLAGS += $(RIOTCPU)/msp430_common/ldscripts/xfa.ld
+endif
 
 OPTIONAL_CFLAGS_BLACKLIST += -fdiagnostics-color
 OPTIONAL_CFLAGS_BLACKLIST += -Wformat-overflow

diff --git a/makefiles/toolchain/gnu.inc.mk b/makefiles/toolchain/gnu.inc.mk
@@ -32,3 +32,10 @@ endif
 
 # We use GDB for debugging
 include $(RIOTMAKE)/tools/gdb.inc.mk
+
+# Data address spaces starts at zero for all supported architectures. This fixes
+# compilation at least on MSP430 and AVR.
+# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
+ifeq ($(GCC_VERSION),12)
+  CFLAGS += --param=min-pagesize=0
+endif
diff --git a/tests/core/Makefile.core_common b/tests/core/Makefile.core_common
@@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common
diff --git a/tests/bitarithm_timings/Makefile → tests/core/bitarithm_timings/Makefile b/tests/bitarithm_timings/Makefile → tests/core/bitarithm_timings/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 

diff --git a/tests/bitarithm_timings/main.c → tests/core/bitarithm_timings/main.c b/tests/bitarithm_timings/main.c → tests/core/bitarithm_timings/main.c
diff --git a/tests/bitarithm_timings/tests/01-run.py → tests/core/bitarithm_timings/tests/01-run.py b/tests/bitarithm_timings/tests/01-run.py → tests/core/bitarithm_timings/tests/01-run.py
diff --git a/tests/cond_order/Makefile → tests/core/cond_order/Makefile b/tests/cond_order/Makefile → tests/core/cond_order/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += test_utils_interactive_sync
 

diff --git a/tests/cond_order/Makefile.ci → tests/core/cond_order/Makefile.ci b/tests/cond_order/Makefile.ci → tests/core/cond_order/Makefile.ci
diff --git a/tests/cond_order/README.md → tests/core/cond_order/README.md b/tests/cond_order/README.md → tests/core/cond_order/README.md
diff --git a/tests/cond_order/main.c → tests/core/cond_order/main.c b/tests/cond_order/main.c → tests/core/cond_order/main.c
diff --git a/tests/cond_order/tests/01-run.py → tests/core/cond_order/tests/01-run.py b/tests/cond_order/tests/01-run.py → tests/core/cond_order/tests/01-run.py
diff --git a/tests/deferred_yield_higher/Makefile → tests/core/deferred_yield_higher/Makefile b/tests/deferred_yield_higher/Makefile → tests/core/deferred_yield_higher/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 FEATURES_BLACKLIST += arch_avr8 arch_msp430 arch_riscv
 

diff --git a/tests/deferred_yield_higher/Makefile.ci → tests/core/deferred_yield_higher/Makefile.ci b/tests/deferred_yield_higher/Makefile.ci → tests/core/deferred_yield_higher/Makefile.ci
diff --git a/tests/deferred_yield_higher/README.md → tests/core/deferred_yield_higher/README.md b/tests/deferred_yield_higher/README.md → tests/core/deferred_yield_higher/README.md
diff --git a/tests/deferred_yield_higher/main.c → tests/core/deferred_yield_higher/main.c b/tests/deferred_yield_higher/main.c → tests/core/deferred_yield_higher/main.c
diff --git a/tests/deferred_yield_higher/tests/test.py → .../core/deferred_yield_higher/tests/test.py b/tests/deferred_yield_higher/tests/test.py → .../core/deferred_yield_higher/tests/test.py
diff --git a/tests/isr_yield_higher/Makefile → tests/core/irq/Makefile b/tests/isr_yield_higher/Makefile → tests/core/irq/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 

diff --git a/tests/irq/Makefile.ci → tests/core/irq/Makefile.ci b/tests/irq/Makefile.ci → tests/core/irq/Makefile.ci
diff --git a/tests/irq/main.c → tests/core/irq/main.c b/tests/irq/main.c → tests/core/irq/main.c
diff --git a/tests/irq/tests/01-run.py → tests/core/irq/tests/01-run.py b/tests/irq/tests/01-run.py → tests/core/irq/tests/01-run.py
diff --git a/tests/irq_cpp/Makefile → tests/core/irq_cpp/Makefile b/tests/irq_cpp/Makefile → tests/core/irq_cpp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 FEATURES_REQUIRED += cpp
 FEATURES_REQUIRED += libstdcpp
 USEPKG += fff

diff --git a/tests/irq_cpp/Makefile.ci → tests/core/irq_cpp/Makefile.ci b/tests/irq_cpp/Makefile.ci → tests/core/irq_cpp/Makefile.ci
diff --git a/tests/irq_cpp/irq.h → tests/core/irq_cpp/irq.h b/tests/irq_cpp/irq.h → tests/core/irq_cpp/irq.h
diff --git a/tests/irq_cpp/main.cpp → tests/core/irq_cpp/main.cpp b/tests/irq_cpp/main.cpp → tests/core/irq_cpp/main.cpp
diff --git a/tests/irq_cpp/tests/01-run.py → tests/core/irq_cpp/tests/01-run.py b/tests/irq_cpp/tests/01-run.py → tests/core/irq_cpp/tests/01-run.py
diff --git a/tests/irq_disable_restore/Makefile → tests/core/irq_disable_restore/Makefile b/tests/irq_disable_restore/Makefile → tests/core/irq_disable_restore/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += fmt
 USEMODULE += xtimer

diff --git a/tests/irq_disable_restore/README.md → tests/core/irq_disable_restore/README.md b/tests/irq_disable_restore/README.md → tests/core/irq_disable_restore/README.md
diff --git a/tests/irq_disable_restore/main.c → tests/core/irq_disable_restore/main.c b/tests/irq_disable_restore/main.c → tests/core/irq_disable_restore/main.c
diff --git a/tests/irq_disable_restore/tests/01-run.py → .../core/irq_disable_restore/tests/01-run.py b/tests/irq_disable_restore/tests/01-run.py → .../core/irq_disable_restore/tests/01-run.py
diff --git a/tests/mutex_cancel/Makefile → tests/core/isr_yield_higher/Makefile b/tests/mutex_cancel/Makefile → tests/core/isr_yield_higher/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 

diff --git a/tests/isr_yield_higher/Makefile.ci → tests/core/isr_yield_higher/Makefile.ci b/tests/isr_yield_higher/Makefile.ci → tests/core/isr_yield_higher/Makefile.ci
diff --git a/tests/isr_yield_higher/main.c → tests/core/isr_yield_higher/main.c b/tests/isr_yield_higher/main.c → tests/core/isr_yield_higher/main.c
diff --git a/tests/isr_yield_higher/tests/test.py → tests/core/isr_yield_higher/tests/test.py b/tests/isr_yield_higher/tests/test.py → tests/core/isr_yield_higher/tests/test.py
diff --git a/tests/msg_queue_print/Makefile → tests/core/msg_avail/Makefile b/tests/msg_queue_print/Makefile → tests/core/msg_avail/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_avail/main.c → tests/core/msg_avail/main.c b/tests/msg_avail/main.c → tests/core/msg_avail/main.c
diff --git a/tests/msg_avail/tests/01-run.py → tests/core/msg_avail/tests/01-run.py b/tests/msg_avail/tests/01-run.py → tests/core/msg_avail/tests/01-run.py
diff --git a/tests/msg_queue_capacity/Makefile → tests/core/msg_queue_capacity/Makefile b/tests/msg_queue_capacity/Makefile → tests/core/msg_queue_capacity/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += embunit
 

diff --git a/tests/msg_queue_capacity/main.c → tests/core/msg_queue_capacity/main.c b/tests/msg_queue_capacity/main.c → tests/core/msg_queue_capacity/main.c
diff --git a/tests/msg_queue_capacity/tests/01-run.py → ...s/core/msg_queue_capacity/tests/01-run.py b/tests/msg_queue_capacity/tests/01-run.py → ...s/core/msg_queue_capacity/tests/01-run.py
diff --git a/tests/msg_send_receive/Makefile → tests/core/msg_queue_print/Makefile b/tests/msg_send_receive/Makefile → tests/core/msg_queue_print/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_queue_print/main.c → tests/core/msg_queue_print/main.c b/tests/msg_queue_print/main.c → tests/core/msg_queue_print/main.c
diff --git a/tests/msg_queue_print/tests/01-run.py → tests/core/msg_queue_print/tests/01-run.py b/tests/msg_queue_print/tests/01-run.py → tests/core/msg_queue_print/tests/01-run.py
diff --git a/tests/msg_avail/Makefile → tests/core/msg_send_receive/Makefile b/tests/msg_avail/Makefile → tests/core/msg_send_receive/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_send_receive/Makefile.ci → tests/core/msg_send_receive/Makefile.ci b/tests/msg_send_receive/Makefile.ci → tests/core/msg_send_receive/Makefile.ci
diff --git a/tests/msg_send_receive/main.c → tests/core/msg_send_receive/main.c b/tests/msg_send_receive/main.c → tests/core/msg_send_receive/main.c
diff --git a/tests/msg_send_receive/tests/01-run.py → tests/core/msg_send_receive/tests/01-run.py b/tests/msg_send_receive/tests/01-run.py → tests/core/msg_send_receive/tests/01-run.py
diff --git a/tests/msg_try_receive/Makefile → tests/core/msg_try_receive/Makefile b/tests/msg_try_receive/Makefile → tests/core/msg_try_receive/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_try_receive/Makefile.ci → tests/core/msg_try_receive/Makefile.ci b/tests/msg_try_receive/Makefile.ci → tests/core/msg_try_receive/Makefile.ci
diff --git a/tests/msg_try_receive/main.c → tests/core/msg_try_receive/main.c b/tests/msg_try_receive/main.c → tests/core/msg_try_receive/main.c
diff --git a/tests/msg_try_receive/tests/01-run.py → tests/core/msg_try_receive/tests/01-run.py b/tests/msg_try_receive/tests/01-run.py → tests/core/msg_try_receive/tests/01-run.py
diff --git a/tests/irq/Makefile → tests/core/mutex_cancel/Makefile b/tests/irq/Makefile → tests/core/mutex_cancel/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 

diff --git a/tests/mutex_cancel/main.c → tests/core/mutex_cancel/main.c b/tests/mutex_cancel/main.c → tests/core/mutex_cancel/main.c
diff --git a/tests/mutex_cancel/tests/01-run.py → tests/core/mutex_cancel/tests/01-run.py b/tests/mutex_cancel/tests/01-run.py → tests/core/mutex_cancel/tests/01-run.py
diff --git a/tests/core/mutex_order/Makefile b/tests/core/mutex_order/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/mutex_order/Makefile.ci → tests/core/mutex_order/Makefile.ci b/tests/mutex_order/Makefile.ci → tests/core/mutex_order/Makefile.ci
diff --git a/tests/mutex_order/README.md → tests/core/mutex_order/README.md b/tests/mutex_order/README.md → tests/core/mutex_order/README.md
diff --git a/tests/mutex_order/main.c → tests/core/mutex_order/main.c b/tests/mutex_order/main.c → tests/core/mutex_order/main.c
diff --git a/tests/mutex_order/tests/01-run.py → tests/core/mutex_order/tests/01-run.py b/tests/mutex_order/tests/01-run.py → tests/core/mutex_order/tests/01-run.py
diff --git a/tests/thread_race/Makefile → tests/core/mutex_unlock_and_sleep/Makefile b/tests/thread_race/Makefile → tests/core/mutex_unlock_and_sleep/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # stm32f030f4-demo doesn't have enough RAM to run the test
 # so we reduce the stack size for every thread

diff --git a/tests/mutex_unlock_and_sleep/Makefile.ci → ...s/core/mutex_unlock_and_sleep/Makefile.ci b/tests/mutex_unlock_and_sleep/Makefile.ci → ...s/core/mutex_unlock_and_sleep/Makefile.ci
diff --git a/tests/mutex_unlock_and_sleep/main.c → tests/core/mutex_unlock_and_sleep/main.c b/tests/mutex_unlock_and_sleep/main.c → tests/core/mutex_unlock_and_sleep/main.c
diff --git a/tests/mutex_unlock_and_sleep/tests/01-run.py → ...re/mutex_unlock_and_sleep/tests/01-run.py b/tests/mutex_unlock_and_sleep/tests/01-run.py → ...re/mutex_unlock_and_sleep/tests/01-run.py
diff --git a/tests/core/rmutex/Makefile b/tests/core/rmutex/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/rmutex/Makefile.ci → tests/core/rmutex/Makefile.ci b/tests/rmutex/Makefile.ci → tests/core/rmutex/Makefile.ci
diff --git a/tests/rmutex/README.md → tests/core/rmutex/README.md b/tests/rmutex/README.md → tests/core/rmutex/README.md
diff --git a/tests/rmutex/main.c → tests/core/rmutex/main.c b/tests/rmutex/main.c → tests/core/rmutex/main.c
diff --git a/tests/rmutex/tests/01-run.py → tests/core/rmutex/tests/01-run.py b/tests/rmutex/tests/01-run.py → tests/core/rmutex/tests/01-run.py
diff --git a/tests/rmutex_cpp/Makefile → tests/core/rmutex_cpp/Makefile b/tests/rmutex_cpp/Makefile → tests/core/rmutex_cpp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 FEATURES_REQUIRED += cpp
 

diff --git a/tests/rmutex_cpp/Makefile.ci → tests/core/rmutex_cpp/Makefile.ci b/tests/rmutex_cpp/Makefile.ci → tests/core/rmutex_cpp/Makefile.ci
diff --git a/tests/rmutex_cpp/README.md → tests/core/rmutex_cpp/README.md b/tests/rmutex_cpp/README.md → tests/core/rmutex_cpp/README.md
diff --git a/tests/rmutex_cpp/main.cpp → tests/core/rmutex_cpp/main.cpp b/tests/rmutex_cpp/main.cpp → tests/core/rmutex_cpp/main.cpp
diff --git a/tests/rmutex_cpp/tests/01-run.py → tests/core/rmutex_cpp/tests/01-run.py b/tests/rmutex_cpp/tests/01-run.py → tests/core/rmutex_cpp/tests/01-run.py
diff --git a/tests/sched_change_priority/Makefile → tests/core/sched_change_priority/Makefile b/tests/sched_change_priority/Makefile → tests/core/sched_change_priority/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += nice
 USEMODULE += ps

diff --git a/tests/sched_change_priority/Makefile.ci → tests/core/sched_change_priority/Makefile.ci b/tests/sched_change_priority/Makefile.ci → tests/core/sched_change_priority/Makefile.ci
diff --git a/tests/sched_change_priority/main.c → tests/core/sched_change_priority/main.c b/tests/sched_change_priority/main.c → tests/core/sched_change_priority/main.c
diff --git a/tests/sched_change_priority/tests/01-run.py → ...ore/sched_change_priority/tests/01-run.py b/tests/sched_change_priority/tests/01-run.py → ...ore/sched_change_priority/tests/01-run.py
diff --git a/tests/core/sched_testing/Makefile b/tests/core/sched_testing/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/sched_testing/Makefile.ci → tests/core/sched_testing/Makefile.ci b/tests/sched_testing/Makefile.ci → tests/core/sched_testing/Makefile.ci
diff --git a/tests/sched_testing/main.c → tests/core/sched_testing/main.c b/tests/sched_testing/main.c → tests/core/sched_testing/main.c
diff --git a/tests/sched_testing/tests/01-run.py → tests/core/sched_testing/tests/01-run.py b/tests/sched_testing/tests/01-run.py → tests/core/sched_testing/tests/01-run.py
diff --git a/tests/core/thread_basic/Makefile b/tests/core/thread_basic/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_basic/Makefile.ci → tests/core/thread_basic/Makefile.ci b/tests/thread_basic/Makefile.ci → tests/core/thread_basic/Makefile.ci
diff --git a/tests/thread_basic/main.c → tests/core/thread_basic/main.c b/tests/thread_basic/main.c → tests/core/thread_basic/main.c
diff --git a/tests/thread_basic/tests/01-run.py → tests/core/thread_basic/tests/01-run.py b/tests/thread_basic/tests/01-run.py → tests/core/thread_basic/tests/01-run.py
diff --git a/tests/thread_cooperation/Makefile → tests/core/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile → tests/core/thread_cooperation/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 ifneq (,$(filter nucleo-f042k6,$(BOARD)))
   PROBLEM ?= 3

diff --git a/tests/thread_cooperation/Makefile.ci → tests/core/thread_cooperation/Makefile.ci b/tests/thread_cooperation/Makefile.ci → tests/core/thread_cooperation/Makefile.ci
diff --git a/tests/thread_cooperation/main.c → tests/core/thread_cooperation/main.c b/tests/thread_cooperation/main.c → tests/core/thread_cooperation/main.c
diff --git a/tests/thread_cooperation/tests/01-run.py → ...s/core/thread_cooperation/tests/01-run.py b/tests/thread_cooperation/tests/01-run.py → ...s/core/thread_cooperation/tests/01-run.py
diff --git a/tests/core/thread_exit/Makefile b/tests/core/thread_exit/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_exit/Makefile.ci → tests/core/thread_exit/Makefile.ci b/tests/thread_exit/Makefile.ci → tests/core/thread_exit/Makefile.ci
diff --git a/tests/thread_exit/README.md → tests/core/thread_exit/README.md b/tests/thread_exit/README.md → tests/core/thread_exit/README.md
diff --git a/tests/thread_exit/main.c → tests/core/thread_exit/main.c b/tests/thread_exit/main.c → tests/core/thread_exit/main.c
diff --git a/tests/thread_exit/tests/01-run.py → tests/core/thread_exit/tests/01-run.py b/tests/thread_exit/tests/01-run.py → tests/core/thread_exit/tests/01-run.py
diff --git a/tests/thread_flags/Makefile → tests/core/thread_flags/Makefile b/tests/thread_flags/Makefile → tests/core/thread_flags/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_thread_flags
 USEMODULE += xtimer

diff --git a/tests/thread_flags/Makefile.ci → tests/core/thread_flags/Makefile.ci b/tests/thread_flags/Makefile.ci → tests/core/thread_flags/Makefile.ci
diff --git a/tests/thread_flags/main.c → tests/core/thread_flags/main.c b/tests/thread_flags/main.c → tests/core/thread_flags/main.c
diff --git a/tests/thread_flags/tests/01-run.py → tests/core/thread_flags/tests/01-run.py b/tests/thread_flags/tests/01-run.py → tests/core/thread_flags/tests/01-run.py
diff --git a/tests/thread_flags_xtimer/Makefile → tests/core/thread_flags_xtimer/Makefile b/tests/thread_flags_xtimer/Makefile → tests/core/thread_flags_xtimer/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_thread_flags
 USEMODULE += xtimer

diff --git a/tests/thread_flags_xtimer/main.c → tests/core/thread_flags_xtimer/main.c b/tests/thread_flags_xtimer/main.c → tests/core/thread_flags_xtimer/main.c
diff --git a/tests/thread_flags_xtimer/tests/01-run.py → .../core/thread_flags_xtimer/tests/01-run.py b/tests/thread_flags_xtimer/tests/01-run.py → .../core/thread_flags_xtimer/tests/01-run.py
diff --git a/tests/thread_float/Makefile → tests/core/thread_float/Makefile b/tests/thread_float/Makefile → tests/core/thread_float/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += printf_float
 USEMODULE += ztimer_usec

diff --git a/tests/thread_float/Makefile.ci → tests/core/thread_float/Makefile.ci b/tests/thread_float/Makefile.ci → tests/core/thread_float/Makefile.ci
diff --git a/tests/thread_float/README.md → tests/core/thread_float/README.md b/tests/thread_float/README.md → tests/core/thread_float/README.md
diff --git a/tests/thread_float/main.c → tests/core/thread_float/main.c b/tests/thread_float/main.c → tests/core/thread_float/main.c
diff --git a/tests/thread_float/tests/01-run.py → tests/core/thread_float/tests/01-run.py b/tests/thread_float/tests/01-run.py → tests/core/thread_float/tests/01-run.py
diff --git a/tests/core/thread_flood/Makefile b/tests/core/thread_flood/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_flood/Makefile.ci → tests/core/thread_flood/Makefile.ci b/tests/thread_flood/Makefile.ci → tests/core/thread_flood/Makefile.ci
diff --git a/tests/thread_flood/main.c → tests/core/thread_flood/main.c b/tests/thread_flood/main.c → tests/core/thread_flood/main.c
diff --git a/tests/thread_flood/tests/01-run.py → tests/core/thread_flood/tests/01-run.py b/tests/thread_flood/tests/01-run.py → tests/core/thread_flood/tests/01-run.py
diff --git a/tests/core/thread_msg/Makefile b/tests/core/thread_msg/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg/Makefile.ci → tests/core/thread_msg/Makefile.ci b/tests/thread_msg/Makefile.ci → tests/core/thread_msg/Makefile.ci
diff --git a/tests/thread_msg/main.c → tests/core/thread_msg/main.c b/tests/thread_msg/main.c → tests/core/thread_msg/main.c
diff --git a/tests/thread_msg/tests/01-run.py → tests/core/thread_msg/tests/01-run.py b/tests/thread_msg/tests/01-run.py → tests/core/thread_msg/tests/01-run.py
diff --git a/tests/thread_msg_block_race/Makefile → tests/core/thread_msg_block_race/Makefile b/tests/thread_msg_block_race/Makefile → tests/core/thread_msg_block_race/Makefile
@@ -1,6 +1,6 @@
 DEVELHELP := 1
 
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 DISABLE_MODULE += auto_init_xtimer
 DISABLE_MODULE += auto_init_random

diff --git a/tests/thread_msg_block_race/Makefile.ci → tests/core/thread_msg_block_race/Makefile.ci b/tests/thread_msg_block_race/Makefile.ci → tests/core/thread_msg_block_race/Makefile.ci
diff --git a/tests/thread_msg_block_race/main.c → tests/core/thread_msg_block_race/main.c b/tests/thread_msg_block_race/main.c → tests/core/thread_msg_block_race/main.c
diff --git a/tests/thread_msg_block_race/tests/01-run.py → ...ore/thread_msg_block_race/tests/01-run.py b/tests/thread_msg_block_race/tests/01-run.py → ...ore/thread_msg_block_race/tests/01-run.py
diff --git a/tests/core/thread_msg_block_w_queue/Makefile b/tests/core/thread_msg_block_w_queue/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_w_queue/Makefile.ci → ...core/thread_msg_block_w_queue/Makefile.ci b/tests/thread_msg_block_w_queue/Makefile.ci → ...core/thread_msg_block_w_queue/Makefile.ci
diff --git a/tests/thread_msg_block_w_queue/README.md → ...s/core/thread_msg_block_w_queue/README.md b/tests/thread_msg_block_w_queue/README.md → ...s/core/thread_msg_block_w_queue/README.md
diff --git a/tests/thread_msg_block_w_queue/main.c → tests/core/thread_msg_block_w_queue/main.c b/tests/thread_msg_block_w_queue/main.c → tests/core/thread_msg_block_w_queue/main.c
diff --git a/.../thread_msg_block_w_queue/tests/01-run.py → .../thread_msg_block_w_queue/tests/01-run.py b/.../thread_msg_block_w_queue/tests/01-run.py → .../thread_msg_block_w_queue/tests/01-run.py
diff --git a/tests/core/thread_msg_block_wo_queue/Makefile b/tests/core/thread_msg_block_wo_queue/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_wo_queue/Makefile.ci → ...ore/thread_msg_block_wo_queue/Makefile.ci b/tests/thread_msg_block_wo_queue/Makefile.ci → ...ore/thread_msg_block_wo_queue/Makefile.ci
diff --git a/tests/thread_msg_block_wo_queue/README.md → .../core/thread_msg_block_wo_queue/README.md b/tests/thread_msg_block_wo_queue/README.md → .../core/thread_msg_block_wo_queue/README.md
diff --git a/tests/thread_msg_block_wo_queue/main.c → tests/core/thread_msg_block_wo_queue/main.c b/tests/thread_msg_block_wo_queue/main.c → tests/core/thread_msg_block_wo_queue/main.c
diff --git a/...thread_msg_block_wo_queue/tests/01-run.py → ...thread_msg_block_wo_queue/tests/01-run.py b/...thread_msg_block_wo_queue/tests/01-run.py → ...thread_msg_block_wo_queue/tests/01-run.py
diff --git a/tests/thread_msg_bus/Makefile → tests/core/thread_msg_bus/Makefile b/tests/thread_msg_bus/Makefile → tests/core/thread_msg_bus/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_msg_bus
 

diff --git a/tests/thread_msg_bus/Makefile.ci → tests/core/thread_msg_bus/Makefile.ci b/tests/thread_msg_bus/Makefile.ci → tests/core/thread_msg_bus/Makefile.ci
diff --git a/tests/thread_msg_bus/main.c → tests/core/thread_msg_bus/main.c b/tests/thread_msg_bus/main.c → tests/core/thread_msg_bus/main.c
diff --git a/tests/thread_msg_bus/tests/01-run.py → tests/core/thread_msg_bus/tests/01-run.py b/tests/thread_msg_bus/tests/01-run.py → tests/core/thread_msg_bus/tests/01-run.py
diff --git a/tests/core/thread_msg_seq/Makefile b/tests/core/thread_msg_seq/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_seq/Makefile.ci → tests/core/thread_msg_seq/Makefile.ci b/tests/thread_msg_seq/Makefile.ci → tests/core/thread_msg_seq/Makefile.ci
diff --git a/tests/thread_msg_seq/main.c → tests/core/thread_msg_seq/main.c b/tests/thread_msg_seq/main.c → tests/core/thread_msg_seq/main.c
diff --git a/tests/thread_msg_seq/tests/01-run.py → tests/core/thread_msg_seq/tests/01-run.py b/tests/thread_msg_seq/tests/01-run.py → tests/core/thread_msg_seq/tests/01-run.py
diff --git a/tests/thread_priority_inversion/Makefile → ...s/core/thread_priority_inversion/Makefile b/tests/thread_priority_inversion/Makefile → ...s/core/thread_priority_inversion/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += fmt
 USEMODULE += core_mutex_priority_inheritance

diff --git a/tests/thread_priority_inversion/README.md → .../core/thread_priority_inversion/README.md b/tests/thread_priority_inversion/README.md → .../core/thread_priority_inversion/README.md
diff --git a/tests/thread_priority_inversion/main.c → tests/core/thread_priority_inversion/main.c b/tests/thread_priority_inversion/main.c → tests/core/thread_priority_inversion/main.c
diff --git a/...thread_priority_inversion/tests/01-run.py → ...thread_priority_inversion/tests/01-run.py b/...thread_priority_inversion/tests/01-run.py → ...thread_priority_inversion/tests/01-run.py
diff --git a/tests/mutex_unlock_and_sleep/Makefile → tests/core/thread_race/Makefile b/tests/mutex_unlock_and_sleep/Makefile → tests/core/thread_race/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # stm32f030f4-demo doesn't have enough RAM to run the test
 # so we reduce the stack size for every thread

diff --git a/tests/thread_race/Makefile.ci → tests/core/thread_race/Makefile.ci b/tests/thread_race/Makefile.ci → tests/core/thread_race/Makefile.ci
diff --git a/tests/thread_race/main.c → tests/core/thread_race/main.c b/tests/thread_race/main.c → tests/core/thread_race/main.c
diff --git a/tests/thread_race/tests/01-run.py → tests/core/thread_race/tests/01-run.py b/tests/thread_race/tests/01-run.py → tests/core/thread_race/tests/01-run.py
diff --git a/tests/thread_stack_alignment/Makefile → tests/core/thread_stack_alignment/Makefile b/tests/thread_stack_alignment/Makefile → tests/core/thread_stack_alignment/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += printf_float
 

diff --git a/tests/thread_stack_alignment/Makefile.ci → ...s/core/thread_stack_alignment/Makefile.ci b/tests/thread_stack_alignment/Makefile.ci → ...s/core/thread_stack_alignment/Makefile.ci
diff --git a/tests/thread_stack_alignment/README.md → tests/core/thread_stack_alignment/README.md b/tests/thread_stack_alignment/README.md → tests/core/thread_stack_alignment/README.md
diff --git a/tests/thread_stack_alignment/main.c → tests/core/thread_stack_alignment/main.c b/tests/thread_stack_alignment/main.c → tests/core/thread_stack_alignment/main.c
diff --git a/tests/thread_stack_alignment/tests/01-run.py → ...re/thread_stack_alignment/tests/01-run.py b/tests/thread_stack_alignment/tests/01-run.py → ...re/thread_stack_alignment/tests/01-run.py
diff --git a/tests/thread_zombie/Makefile → tests/core/thread_zombie/Makefile b/tests/thread_zombie/Makefile → tests/core/thread_zombie/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # For better testing use ps
 #USEMODULE += ps

diff --git a/tests/thread_zombie/Makefile.ci → tests/core/thread_zombie/Makefile.ci b/tests/thread_zombie/Makefile.ci → tests/core/thread_zombie/Makefile.ci
diff --git a/tests/thread_zombie/main.c → tests/core/thread_zombie/main.c b/tests/thread_zombie/main.c → tests/core/thread_zombie/main.c
diff --git a/tests/thread_zombie/tests/01-run.py → tests/core/thread_zombie/tests/01-run.py b/tests/thread_zombie/tests/01-run.py → tests/core/thread_zombie/tests/01-run.py
diff --git a/tests/mutex_order/Makefile b/tests/mutex_order/Makefile
diff --git a/tests/rmutex/Makefile b/tests/rmutex/Makefile
diff --git a/tests/sched_testing/Makefile b/tests/sched_testing/Makefile
diff --git a/tests/thread_basic/Makefile b/tests/thread_basic/Makefile
diff --git a/tests/thread_exit/Makefile b/tests/thread_exit/Makefile
diff --git a/tests/thread_flood/Makefile b/tests/thread_flood/Makefile
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
diff --git a/tests/thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile
diff --git a/tests/thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		RIOTBASE ?= $(CURDIR)/../../..
		include $(CURDIR)/../../Makefile.tests_common
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		include ../Makefile.core_common

		include $(RIOTBASE)/Makefile.include