10 files changed, 30 insertions, 10 deletions
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery
index 0d3665820..03f5e40ba 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f051_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex b/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex
index f0f7015ba..055e48c3a 100755
--- a/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f103_olimex
@@ -101,7 +101,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F103xB.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
index 2b8a07d3b..bb34d3621 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f303_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f373_eval b/testhal/STM32/multi/PAL/Makefile-stm32f373_eval
index c3bac4224..aad163830 100755
--- a/testhal/STM32/multi/PAL/Makefile-stm32f373_eval
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f373_eval
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F373xC.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
index 3e4d4c1a0..0118e1b25 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery
index ac05c5d4b..1441f8edf 100755
--- a/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f429_discovery
@@ -107,7 +107,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F429xI.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery
index 324554b73..ea233ce68 100755
--- a/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f746_discovery
@@ -107,7 +107,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F746xG.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery b/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery
index 8cebb1ab5..ae30f2ad6 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32l053_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L053x8.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery b/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery
index 018506ab4..99ebec116 100755
--- a/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32l151_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery b/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
index 28561d007..9d9e42477 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32l476_discovery
@@ -102,7 +102,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/rt/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32L476xG.ld