diff options
257 files changed, 771 insertions, 257 deletions
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile index 84eeb61bb..06b7b6bf9 100755 --- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile +++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.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)/SAMA5D2-T.ld
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c index 866c3b723..176745464 100755 --- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c +++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* LED blinker thread, times are in milliseconds.
@@ -66,8 +67,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if(!palReadPad(PIOB, PIOB_USER_PB))
- test_execute((BaseSequentialStream *)&SD0);
+ if(!palReadPad(PIOB, PIOB_USER_PB)) {
+ test_execute((BaseSequentialStream *)&SD0, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD0, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile index b4ce69477..c9fa1346f 100644 --- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile +++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# List C source files here. (C dependencies are automatically generated.)
CSRC = $(KERNSRC) \
diff --git a/demos/AVR/NIL-ARDUINO-MINI/Makefile b/demos/AVR/NIL-ARDUINO-MINI/Makefile index 9bf2a77d2..b692c085e 100644 --- a/demos/AVR/NIL-ARDUINO-MINI/Makefile +++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# List C source files here. (C dependencies are automatically generated.)
CSRC = $(KERNSRC) \
diff --git a/demos/AVR/NIL-ARDUINO-NANO/Makefile b/demos/AVR/NIL-ARDUINO-NANO/Makefile index cebb352b4..f6ae708b8 100644 --- a/demos/AVR/NIL-ARDUINO-NANO/Makefile +++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# List C source files here. (C dependencies are automatically generated.)
CSRC = $(KERNSRC) \
diff --git a/demos/AVR/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile index 67832ca8d..cd6957d03 100644 --- a/demos/AVR/NIL-ARDUINO-UNO/Makefile +++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# List C source files here. (C dependencies are automatically generated.)
CSRC = $(KERNSRC) \
diff --git a/demos/AVR/NIL-MT-DB-X4/Makefile b/demos/AVR/NIL-MT-DB-X4/Makefile index 7373289c6..ba48c1d99 100644 --- a/demos/AVR/NIL-MT-DB-X4/Makefile +++ b/demos/AVR/NIL-MT-DB-X4/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# List C source files here. (C dependencies are automatically generated.)
diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile index 16ad14dc3..6fd8f2bd6 100644 --- a/demos/AVR/RT-ARDUINO-MEGA/Makefile +++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.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
# List C source files here. (C dependencies are automatically generated.)
CSRC = $(KERNSRC) \
diff --git a/demos/AVR/RT-ARDUINO-MEGA/main.c b/demos/AVR/RT-ARDUINO-MEGA/main.c index dd2e663f4..7cd6b98c5 100644 --- a/demos/AVR/RT-ARDUINO-MEGA/main.c +++ b/demos/AVR/RT-ARDUINO-MEGA/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
static THD_WORKING_AREA(waThread1, 32);
static THD_FUNCTION(Thread1, arg) {
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile b/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile index 7c49c63e5..57620a023 100644 --- a/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile +++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARM/compilers/GCC/mk/port_generic.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)/LPC2148.ld
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c index bc52e4f58..2c63f6315 100644 --- a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c +++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
#define BOTH_BUTTONS (PAL_PORT_BIT(PA_BUTTON1) | PAL_PORT_BIT(PA_BUTTON2))
@@ -89,8 +90,10 @@ int main(void) { while (true) {
if (!palReadPad(IOPORT1, PA_BUTTON1))
sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);
- if (!palReadPad(IOPORT1, PA_BUTTON2))
+ if (!palReadPad(IOPORT1, PA_BUTTON2)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
return 0;
diff --git a/demos/SPC5/RT-SPC560B-EVB/Makefile b/demos/SPC5/RT-SPC560B-EVB/Makefile index 1dcec9b2d..e53f7065d 100644 --- a/demos/SPC5/RT-SPC560B-EVB/Makefile +++ b/demos/SPC5/RT-SPC560B-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC560B-EVB/main.c b/demos/SPC5/RT-SPC560B-EVB/main.c index 73848f73f..98b1028bb 100644 --- a/demos/SPC5/RT-SPC560B-EVB/main.c +++ b/demos/SPC5/RT-SPC560B-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC560D-EVB/Makefile b/demos/SPC5/RT-SPC560D-EVB/Makefile index 17d0108ff..ed53373db 100644 --- a/demos/SPC5/RT-SPC560D-EVB/Makefile +++ b/demos/SPC5/RT-SPC560D-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC560D-EVB/main.c b/demos/SPC5/RT-SPC560D-EVB/main.c index 73848f73f..98b1028bb 100644 --- a/demos/SPC5/RT-SPC560D-EVB/main.c +++ b/demos/SPC5/RT-SPC560D-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC560P-EVB/Makefile b/demos/SPC5/RT-SPC560P-EVB/Makefile index 9a847de2e..0d8c330a4 100644 --- a/demos/SPC5/RT-SPC560P-EVB/Makefile +++ b/demos/SPC5/RT-SPC560P-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC560P-EVB/main.c b/demos/SPC5/RT-SPC560P-EVB/main.c index eb07ade01..f0eef04c5 100644 --- a/demos/SPC5/RT-SPC560P-EVB/main.c +++ b/demos/SPC5/RT-SPC560P-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC563M-EVB/Makefile b/demos/SPC5/RT-SPC563M-EVB/Makefile index 7ec8501fd..0bb12669d 100644 --- a/demos/SPC5/RT-SPC563M-EVB/Makefile +++ b/demos/SPC5/RT-SPC563M-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC563M-EVB/main.c b/demos/SPC5/RT-SPC563M-EVB/main.c index 281aba778..30a19694c 100644 --- a/demos/SPC5/RT-SPC563M-EVB/main.c +++ b/demos/SPC5/RT-SPC563M-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC564A-EVB/Makefile b/demos/SPC5/RT-SPC564A-EVB/Makefile index 114bd8d87..acea8219c 100644 --- a/demos/SPC5/RT-SPC564A-EVB/Makefile +++ b/demos/SPC5/RT-SPC564A-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC564A-EVB/main.c b/demos/SPC5/RT-SPC564A-EVB/main.c index 281aba778..30a19694c 100644 --- a/demos/SPC5/RT-SPC564A-EVB/main.c +++ b/demos/SPC5/RT-SPC564A-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile b/demos/SPC5/RT-SPC56EC-EVB/Makefile index 1cfe85049..073423cd7 100644 --- a/demos/SPC5/RT-SPC56EC-EVB/Makefile +++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs b/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs index 8f04d6d26..b1e3197e4 100644 --- a/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs +++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GHS/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC56EC-EVB/main.c b/demos/SPC5/RT-SPC56EC-EVB/main.c index 73848f73f..98b1028bb 100644 --- a/demos/SPC5/RT-SPC56EC-EVB/main.c +++ b/demos/SPC5/RT-SPC56EC-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/SPC5/RT-SPC56EL-EVB/Makefile b/demos/SPC5/RT-SPC56EL-EVB/Makefile index 9ae00d026..481a9a339 100644 --- a/demos/SPC5/RT-SPC56EL-EVB/Makefile +++ b/demos/SPC5/RT-SPC56EL-EVB/Makefile @@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/SPC5/RT-SPC56EL-EVB/main.c b/demos/SPC5/RT-SPC56EL-EVB/main.c index eb07ade01..f0eef04c5 100644 --- a/demos/SPC5/RT-SPC56EL-EVB/main.c +++ b/demos/SPC5/RT-SPC56EL-EVB/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile index 6542bce8b..139f74bac 100644 --- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/common/abstractions/cmsis_os/cmsis_os.mk
# Define linker script file here
diff --git a/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile index a1a3f342e..c97dceac5 100644 --- a/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/HAL-STM32F407-DISCOVERY/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/os-less/ARMCMx/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/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile index 6383efc11..e695d95bb 100644 --- a/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F100xB.ld
diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile index b37e22f6c..1dd193a80 100644 --- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile +++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-include $(CHIBIOS)/test/nil/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F373xC.ld
diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile index d66563a6f..e5b60457f 100644 --- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile +++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/nil/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L011x4.ld
diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile index 6accffac2..de5aaaebe 100644 --- a/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32L152-DISCOVERY/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/nil/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex index ffc7933b7..7e39008d2 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery index 7ce8280b6..e1ebb9d81 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery @@ -106,7 +106,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile index 19db79540..8b6844b1b 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F030x8.ld
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile index ae3c4a414..8a46fe43b 100644 --- a/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile +++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/Makefile @@ -98,7 +98,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)/STM32F031x6.ld
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c index f8cc3d6c5..aa0504184 100644 --- a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -65,8 +66,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_ARD_D3))
+ if (!palReadLine(LINE_ARD_D3)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile index efb42992d..14d063217 100644 --- a/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile +++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/Makefile @@ -98,7 +98,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)/STM32F042x6.ld
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c index c868f8993..9db2932f4 100644 --- a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -65,8 +66,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_ARD_D3))
+ if (!palReadLine(LINE_ARD_D3)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/Makefile b/demos/STM32/RT-STM32F051-DISCOVERY/Makefile index 25d8f022e..ee65b9cb9 100644 --- a/demos/STM32/RT-STM32F051-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F051-DISCOVERY/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F051-DISCOVERY/main.c b/demos/STM32/RT-STM32F051-DISCOVERY/main.c index 33fb2be92..9e76b1e00 100644 --- a/demos/STM32/RT-STM32F051-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F051-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blue LED blinker thread, times are in milliseconds.
@@ -86,8 +87,10 @@ int main(void) { * driver 1.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile index 5b85b4324..700d6fa21 100644 --- a/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F070xB.ld
diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile index dabe23ca2..0485b1bb9 100644 --- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile @@ -98,7 +98,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)/STM32F072xB.ld
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/main.c b/demos/STM32/RT-STM32F072-DISCOVERY/main.c index 76cc46e3c..46d57a566 100644 --- a/demos/STM32/RT-STM32F072-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F072-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blue LED blinker thread, times are in milliseconds.
@@ -86,8 +87,10 @@ int main(void) { * driver 1.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile index fce26fe70..1ad4db40c 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F072xB.ld
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c index d4c6ae94f..8c7e13d5a 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c @@ -18,6 +18,7 @@ #include "hal.h"
#include "chprintf.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -66,8 +67,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile b/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile index e3888c708..e71f755d5 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F091xC.ld
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c b/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/Makefile b/demos/STM32/RT-STM32F100-DISCOVERY/Makefile index f30ea80d1..b16605ffd 100644 --- a/demos/STM32/RT-STM32F100-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F100-DISCOVERY/Makefile @@ -98,7 +98,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)/STM32F100xB.ld
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/main.c b/demos/STM32/RT-STM32F100-DISCOVERY/main.c index a33d9e05d..7cddc53cd 100644 --- a/demos/STM32/RT-STM32F100-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F100-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blinker thread #1.
@@ -85,8 +86,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile index 5fc0bb1ee..a26f18744 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile @@ -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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c index ac267239a..4e1c7ac35 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c @@ -19,7 +19,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile index 45827fbef..ef9f8546d 100755 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c index cf7d527fa..85f0e4a4f 100755 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c @@ -18,7 +18,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "chprintf.h"
#include "shell.h"
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile index 8d6649ad6..6ca381dc3 100644 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c index 8e32a3ac4..f81c2f9b1 100644 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blinker thread.
@@ -67,8 +68,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile index 85a28d756..88486a510 100644 --- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile +++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c index 7ae75aa63..ec91f939a 100644 --- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c @@ -19,7 +19,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "chprintf.h"
#include "shell.h"
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile index c801b19a6..5cfb3834c 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile index 728b0c3e9..75ab356f9 100644 --- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c index a33bb6ad5..3e91ef18c 100644 --- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c @@ -19,7 +19,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile index a70cbbe91..071e341d3 100644 --- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile +++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c index 329f9f0e0..93c9e88ce 100644 --- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c +++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
#include "lwipthread.h"
@@ -75,8 +76,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0)
+ if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/Makefile b/demos/STM32/RT-STM32F207-DISCOVERY/Makefile index 41f0a7352..1b8006fc8 100644 --- a/demos/STM32/RT-STM32F207-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F207-DISCOVERY/Makefile @@ -98,7 +98,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)/STM32F207xG.ld
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/main.c b/demos/STM32/RT-STM32F207-DISCOVERY/main.c index 335a6c293..0c8fd5d07 100644 --- a/demos/STM32/RT-STM32F207-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F207-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -68,8 +69,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile index fd62157c5..a8926e095 100644 --- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile index 344395d09..c0f2c3a46 100644 --- a/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F302x8.ld
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c index 8c7e2ade9..24cae4bc2 100644 --- a/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY-REVC/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/Makefile index db0ac4a27..31810aa4c 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY-REVC/Makefile +++ b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c index 68b1cb2e5..02b924ec4 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c +++ b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blinker thread #1.
@@ -93,8 +94,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile index ce02b6bca..ba4959bcf 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F303-DISCOVERY/main.c b/demos/STM32/RT-STM32F303-DISCOVERY/main.c index b3703eb86..00d870219 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F303-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blinker thread #1.
@@ -96,8 +97,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile b/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile index 1f093717c..0f08860b3 100644 --- a/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile +++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/Makefile @@ -98,7 +98,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)/STM32F303x8.ld
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c index c868f8993..9db2932f4 100644 --- a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -65,8 +66,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_ARD_D3))
+ if (!palReadLine(LINE_ARD_D3)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile index 25c7b8123..bf5377a39 100644 --- a/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F303xE.ld
diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile b/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile index cfbc8c596..9f9df6303 100644 --- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/Makefile @@ -98,7 +98,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)/STM32F303xE.ld
diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c b/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/Makefile b/demos/STM32/RT-STM32F334-DISCOVERY/Makefile index 094c9a4d0..e5db1ae2d 100644 --- a/demos/STM32/RT-STM32F334-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F334-DISCOVERY/Makefile @@ -98,7 +98,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)/STM32F334x8.ld
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/main.c b/demos/STM32/RT-STM32F334-DISCOVERY/main.c index 28c0767bc..36f13f5ea 100644 --- a/demos/STM32/RT-STM32F334-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F334-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* LEDs blinker thread, times are in milliseconds.
@@ -83,8 +84,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile index ec33293b7..c8ba8d3b4 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F334x8.ld
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile index e46a665c3..6ff45e840 100644 --- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile +++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c index 087f316fb..f9558a838 100644 --- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c +++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing LEDs.
@@ -75,8 +76,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_WKUP_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_WKUP_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile b/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile index d7af84078..c8aeefacf 100644 --- a/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F401C-DISCOVERY/Makefile @@ -98,7 +98,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)/STM32F401xC.ld
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c index 335a6c293..0c8fd5d07 100644 --- a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -68,8 +69,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile index 6f2244749..12d619ccd 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F401xE.ld
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c index 143136a2d..d24f8c7aa 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile index 7c0962dd4..d6e022cc4 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile @@ -98,7 +98,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 include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk # Define linker script file here diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp index c7e332655..67868c5bc 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp +++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp @@ -17,6 +17,7 @@ #include "ch.hpp" #include "hal.h" #include "rt_test_root.h" +#include "oslib_test_root.h" using namespace chibios_rt; @@ -130,6 +131,7 @@ protected: setName("tester"); test_execute((BaseSequentialStream *)&SD2, &rt_test_suite); + test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite); exit(test_global_fail); } diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY/Makefile index 48e2bcc33..f763c8581 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32F407-DISCOVERY/main.c b/demos/STM32/RT-STM32F407-DISCOVERY/main.c index 335a6c293..0c8fd5d07 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F407-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -68,8 +69,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile index 82ededc2b..0b354a0d8 100644 --- a/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F410xB.ld
diff --git a/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile index 5e7373862..39b0ca818 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32F411xE.ld
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile index 1c774445d..0db5ea006 100644 --- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile index ea048af7b..4045a7643 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/main.c b/demos/STM32/RT-STM32F429-DISCOVERY/main.c index a7147f07f..2637e31f8 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F429-DISCOVERY/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "chprintf.h"
#include "shell.h"
diff --git a/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile b/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile index 46779cd78..600873ea3 100644 --- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c b/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile index fa67b1653..6b6ae7323 100644 --- a/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile b/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile index 056bf3b3b..d8abba1f5 100644 --- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c b/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile b/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile index 371ecd20b..6212b388c 100644 --- a/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F469I-DISCOVERY/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/main.c b/demos/STM32/RT-STM32F469I-DISCOVERY/main.c index 6422193a1..6cade4727 100644 --- a/demos/STM32/RT-STM32F469I-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F469I-DISCOVERY/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "chprintf.h"
#include "shell.h"
diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile index 9aaccd65a..265da1078 100644 --- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile @@ -103,7 +103,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/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile b/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile index 9c93479c1..7e4a05598 100644 --- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile @@ -103,7 +103,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)/STM32F76xxI.ld
diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c b/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c index 2bba46595..8cfc7fc38 100644 --- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -73,8 +74,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile b/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile index 4659fbbfc..c03ec122d 100644 --- a/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile @@ -103,7 +103,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)/STM32F76xxI.ld
diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/main.c b/demos/STM32/RT-STM32F769I-DISCOVERY/main.c index 5d647b2cd..57a2f4eb2 100644 --- a/demos/STM32/RT-STM32F769I-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F769I-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -71,8 +72,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON_USER))
+ if (palReadLine(LINE_BUTTON_USER)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile b/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile index 6f39bd6da..19d5a0ea1 100644 --- a/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile +++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/Makefile @@ -98,7 +98,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)/STM32L031x6.ld
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c index c868f8993..9db2932f4 100644 --- a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -65,8 +66,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_ARD_D3))
+ if (!palReadLine(LINE_ARD_D3)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L053-DISCOVERY/Makefile b/demos/STM32/RT-STM32L053-DISCOVERY/Makefile index d4faea106..566bac1b2 100644 --- a/demos/STM32/RT-STM32L053-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32L053-DISCOVERY/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32L053-DISCOVERY/main.c b/demos/STM32/RT-STM32L053-DISCOVERY/main.c index bb12bee7c..b56715e91 100644 --- a/demos/STM32/RT-STM32L053-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32L053-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_BUTTON))
+ if (palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile b/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile index bca6d0281..50772dae7 100644 --- a/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c b/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile b/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile index 86f691972..271719bae 100644 --- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32L073xZ.ld
diff --git a/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c b/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/Makefile b/demos/STM32/RT-STM32L152-DISCOVERY/Makefile index 08756fa98..63c2b81b1 100644 --- a/demos/STM32/RT-STM32L152-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32L152-DISCOVERY/Makefile @@ -98,7 +98,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/demos/STM32/RT-STM32L152-DISCOVERY/main.c b/demos/STM32/RT-STM32L152-DISCOVERY/main.c index 884443831..115accc1b 100644 --- a/demos/STM32/RT-STM32L152-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32L152-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Blinker thread #1.
@@ -87,8 +88,10 @@ int main(void) { * pressed the test procedure is launched.
*/
while (true) {
- if (palReadPad(GPIOA, GPIOA_BUTTON))
+ if (palReadPad(GPIOA, GPIOA_BUTTON)) {
test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile index 5d7f130ff..5e1ec6384 100644 --- a/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile @@ -98,7 +98,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)/STM32L152xE.ld
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c b/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadPad(GPIOC, GPIOC_BUTTON))
+ if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile b/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile index abac4c81d..b8b85fdf5 100644 --- a/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile +++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/Makefile @@ -98,7 +98,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)/STM32L432xC.ld
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c b/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c index 8e847910d..a492947c1 100644 --- a/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c +++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_ARD_D3))
+ if (!palReadLine(LINE_ARD_D3)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/Makefile b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile index 7b092d0b7..ab749e73b 100644 --- a/demos/STM32/RT-STM32L476-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile @@ -98,7 +98,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
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/main.c b/demos/STM32/RT-STM32L476-DISCOVERY/main.c index f68a533e6..092987da9 100644 --- a/demos/STM32/RT-STM32L476-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32L476-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* LEDs blinker thread, times are in milliseconds.
@@ -68,8 +69,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (palReadLine(LINE_JOY_CENTER))
+ if (palReadLine(LINE_JOY_CENTER)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile b/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile index f7e6deec2..2b4090d0c 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile @@ -98,7 +98,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
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c b/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c index 90a50af24..6e02c9f8b 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h"
#include "hal.h"
#include "rt_test_root.h"
+#include "oslib_test_root.h"
/*
* Green LED blinker thread, times are in milliseconds.
@@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state.
*/
while (true) {
- if (!palReadLine(LINE_BUTTON))
+ if (!palReadLine(LINE_BUTTON)) {
test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+ }
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/various/NIL-ARMCM0-GENERIC/Makefile b/demos/various/NIL-ARMCM0-GENERIC/Makefile index 3c16f2ad0..5a7fe2e0d 100644 --- a/demos/various/NIL-ARMCM0-GENERIC/Makefile +++ b/demos/various/NIL-ARMCM0-GENERIC/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.m include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/nil/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F051x8.ld
diff --git a/demos/various/NIL-ARMCM4-GENERIC/Makefile b/demos/various/NIL-ARMCM4-GENERIC/Makefile index 30b4f1c34..52873cd39 100644 --- a/demos/various/NIL-ARMCM4-GENERIC/Makefile +++ b/demos/various/NIL-ARMCM4-GENERIC/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/nil/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/nil/nil_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
diff --git a/demos/various/RT-ARM7-GENERIC/Makefile b/demos/various/RT-ARM7-GENERIC/Makefile index fa01d3a08..c93489b4b 100644 --- a/demos/various/RT-ARM7-GENERIC/Makefile +++ b/demos/various/RT-ARM7-GENERIC/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/common/startup/ARM/compilers/GCC/mk/startup_lpc214x.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARM/compilers/GCC/mk/port_generic.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)/LPC2148.ld
diff --git a/demos/various/RT-ARMCM0-GENERIC/Makefile b/demos/various/RT-ARMCM0-GENERIC/Makefile index 40ca069fa..c4e08559e 100644 --- a/demos/various/RT-ARMCM0-GENERIC/Makefile +++ b/demos/various/RT-ARMCM0-GENERIC/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.m 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/demos/various/RT-ARMCM4-GENERIC/Makefile b/demos/various/RT-ARMCM4-GENERIC/Makefile index 9bc8d5d30..604f5f537 100644 --- a/demos/various/RT-ARMCM4-GENERIC/Makefile +++ b/demos/various/RT-ARMCM4-GENERIC/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m 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/demos/various/RT-Posix-Simulator/Makefile b/demos/various/RT-Posix-Simulator/Makefile index 9578952a9..bf2de06aa 100755 --- a/demos/various/RT-Posix-Simulator/Makefile +++ b/demos/various/RT-Posix-Simulator/Makefile @@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/various/RT-Posix-Simulator/main.c b/demos/various/RT-Posix-Simulator/main.c index 40e5aafb4..e44aea728 100755 --- a/demos/various/RT-Posix-Simulator/main.c +++ b/demos/various/RT-Posix-Simulator/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile index b818f72b6..cc5c62746 100644 --- a/demos/various/RT-Win32-Simulator/Makefile +++ b/demos/various/RT-Win32-Simulator/Makefile @@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/demos/various/RT-Win32-Simulator/main.c b/demos/various/RT-Win32-Simulator/main.c index 40e5aafb4..e44aea728 100644 --- a/demos/various/RT-Win32-Simulator/main.c +++ b/demos/various/RT-Win32-Simulator/main.c @@ -16,7 +16,6 @@ #include "ch.h"
#include "hal.h"
-#include "rt_test_root.h"
#include "shell.h"
#include "chprintf.h"
diff --git a/test/hal/testbuild/Makefile b/test/hal/testbuild/Makefile index 4703aea8a..b71eb45fa 100644 --- a/test/hal/testbuild/Makefile +++ b/test/hal/testbuild/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/templates/osal/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/test/nil/testbuild/Makefile b/test/nil/testbuild/Makefile index b5910c4f7..d17de8134 100755 --- a/test/nil/testbuild/Makefile +++ b/test/nil/testbuild/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.m include $(CHIBIOS)/os/nil/nil.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-#include $(CHIBIOS)/test/nil/test.mk
+#include $(CHIBIOS)/test/lib/test.mk
+#include $(CHIBIOS)/test/nil/nil_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
diff --git a/test/rt/testbuild/Makefile b/test/rt/testbuild/Makefile index 5c07ab587..ce80802c8 100755 --- a/test/rt/testbuild/Makefile +++ b/test/rt/testbuild/Makefile @@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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
#include $(CHIBIOS)/os/hal/lib/streams/streams.mk
#include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/test/rt/testbuild/Makefile_win32 b/test/rt/testbuild/Makefile_win32 index 093216059..8625d1e1b 100755 --- a/test/rt/testbuild/Makefile_win32 +++ b/test/rt/testbuild/Makefile_win32 @@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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
#include $(CHIBIOS)/os/hal/lib/streams/streams.mk
#include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/test/rt/testbuild/main.c b/test/rt/testbuild/main.c index 3363e398f..7ac37c74a 100644 --- a/test/rt/testbuild/main.c +++ b/test/rt/testbuild/main.c @@ -20,7 +20,8 @@ #include "ch.h"
#include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
+#include "oslib_test_root.h"
#include "console.h"
/*
@@ -42,7 +43,8 @@ int main(int argc, char *argv[]) { conInit();
chSysInit();
- test_execute((BaseSequentialStream *)&CD1);
+ test_execute((BaseSequentialStream *)&CD1, &rt_test_suite);
+ test_execute((BaseSequentialStream *)&CD1, &oslib_test_suite);
if (test_global_fail)
exit(1);
else
diff --git a/testhal/ATSAMA5D2/MATRIX/Makefile b/testhal/ATSAMA5D2/MATRIX/Makefile index 175f0b081..432a1b5c4 100755 --- a/testhal/ATSAMA5D2/MATRIX/Makefile +++ b/testhal/ATSAMA5D2/MATRIX/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.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)/SAMA5D2-T.ld
diff --git a/testhal/ATSAMA5D2/SPI/Makefile b/testhal/ATSAMA5D2/SPI/Makefile index dc32bec1b..40375f7ac 100644 --- a/testhal/ATSAMA5D2/SPI/Makefile +++ b/testhal/ATSAMA5D2/SPI/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.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)/SAMA5D2-T.ld
diff --git a/testhal/ATSAMA5D2/UART/Makefile b/testhal/ATSAMA5D2/UART/Makefile index a747e9b67..2771cd490 100644 --- a/testhal/ATSAMA5D2/UART/Makefile +++ b/testhal/ATSAMA5D2/UART/Makefile @@ -122,7 +122,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.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)/SAMA5D2-T.ld
diff --git a/testhal/STM32/STM32F0xx/ADC/Makefile b/testhal/STM32/STM32F0xx/ADC/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/ADC/Makefile +++ b/testhal/STM32/STM32F0xx/ADC/Makefile @@ -93,7 +93,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/STM32F0xx/CAN/Makefile b/testhal/STM32/STM32F0xx/CAN/Makefile index 7ffed33a3..158e8e5ff 100644 --- a/testhal/STM32/STM32F0xx/CAN/Makefile +++ b/testhal/STM32/STM32F0xx/CAN/Makefile @@ -93,7 +93,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)/STM32F072xB.ld
diff --git a/testhal/STM32/STM32F0xx/EXT/Makefile b/testhal/STM32/STM32F0xx/EXT/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/EXT/Makefile +++ b/testhal/STM32/STM32F0xx/EXT/Makefile @@ -93,7 +93,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/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile index 2736747ba..77e32749c 100644 --- a/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F0xx/IRQ_STORM/Makefile @@ -93,7 +93,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/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F0xx/PWM-ICU/Makefile @@ -93,7 +93,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/STM32F0xx/SPI/Makefile b/testhal/STM32/STM32F0xx/SPI/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/SPI/Makefile +++ b/testhal/STM32/STM32F0xx/SPI/Makefile @@ -93,7 +93,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/STM32F0xx/UART/Makefile b/testhal/STM32/STM32F0xx/UART/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/UART/Makefile +++ b/testhal/STM32/STM32F0xx/UART/Makefile @@ -93,7 +93,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/STM32F0xx/USB_CDC/Makefile b/testhal/STM32/STM32F0xx/USB_CDC/Makefile index 0821212de..f75d3b39c 100644 --- a/testhal/STM32/STM32F0xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F0xx/USB_CDC/Makefile @@ -93,7 +93,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F0xx/WDG/Makefile b/testhal/STM32/STM32F0xx/WDG/Makefile index c754ff09d..5519eb0ba 100644 --- a/testhal/STM32/STM32F0xx/WDG/Makefile +++ b/testhal/STM32/STM32F0xx/WDG/Makefile @@ -93,7 +93,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/STM32F1xx/ADC/Makefile b/testhal/STM32/STM32F1xx/ADC/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/ADC/Makefile +++ b/testhal/STM32/STM32F1xx/ADC/Makefile @@ -98,7 +98,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/STM32F1xx/CAN/Makefile b/testhal/STM32/STM32F1xx/CAN/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/CAN/Makefile +++ b/testhal/STM32/STM32F1xx/CAN/Makefile @@ -98,7 +98,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/STM32F1xx/EXT/Makefile b/testhal/STM32/STM32F1xx/EXT/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/EXT/Makefile +++ b/testhal/STM32/STM32F1xx/EXT/Makefile @@ -98,7 +98,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/STM32F1xx/I2C/Makefile b/testhal/STM32/STM32F1xx/I2C/Makefile index 11872d146..cda1e560f 100644 --- a/testhal/STM32/STM32F1xx/I2C/Makefile +++ b/testhal/STM32/STM32F1xx/I2C/Makefile @@ -98,7 +98,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/STM32F1xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile index 4a2968604..251e0aa9f 100644 --- a/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F1xx/IRQ_STORM/Makefile @@ -98,7 +98,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/STM32F1xx/PWM-ICU/Makefile b/testhal/STM32/STM32F1xx/PWM-ICU/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F1xx/PWM-ICU/Makefile @@ -98,7 +98,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/STM32F1xx/RTC/Makefile b/testhal/STM32/STM32F1xx/RTC/Makefile index ddda09161..510fc6ed5 100644 --- a/testhal/STM32/STM32F1xx/RTC/Makefile +++ b/testhal/STM32/STM32F1xx/RTC/Makefile @@ -98,7 +98,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/STM32F1xx/SPI/Makefile b/testhal/STM32/STM32F1xx/SPI/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/SPI/Makefile +++ b/testhal/STM32/STM32F1xx/SPI/Makefile @@ -98,7 +98,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/STM32F1xx/UART/Makefile b/testhal/STM32/STM32F1xx/UART/Makefile index e7ea0371e..c136795b9 100644 --- a/testhal/STM32/STM32F1xx/UART/Makefile +++ b/testhal/STM32/STM32F1xx/UART/Makefile @@ -98,7 +98,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/STM32F1xx/USB_CDC/Makefile b/testhal/STM32/STM32F1xx/USB_CDC/Makefile index 9786011f9..bbdad5d97 100644 --- a/testhal/STM32/STM32F1xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F1xx/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile b/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile index 3e7ce2936..3492cf053 100644 --- a/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile +++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/Makefile @@ -93,7 +93,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F2xx/EXT/Makefile b/testhal/STM32/STM32F2xx/EXT/Makefile index 1ca9b821a..38f2b42a3 100644 --- a/testhal/STM32/STM32F2xx/EXT/Makefile +++ b/testhal/STM32/STM32F2xx/EXT/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/testhal/STM32/STM32F2xx/PWM-ICU/Makefile b/testhal/STM32/STM32F2xx/PWM-ICU/Makefile index 1ca9b821a..38f2b42a3 100644 --- a/testhal/STM32/STM32F2xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F2xx/PWM-ICU/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
diff --git a/testhal/STM32/STM32F2xx/USB_CDC/Makefile b/testhal/STM32/STM32F2xx/USB_CDC/Makefile index b860a68f6..6b34ee3d4 100644 --- a/testhal/STM32/STM32F2xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F2xx/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F37x/ADC/Makefile b/testhal/STM32/STM32F37x/ADC/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/ADC/Makefile +++ b/testhal/STM32/STM32F37x/ADC/Makefile @@ -98,7 +98,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/STM32F37x/CAN/Makefile b/testhal/STM32/STM32F37x/CAN/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/CAN/Makefile +++ b/testhal/STM32/STM32F37x/CAN/Makefile @@ -98,7 +98,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/STM32F37x/EXT/Makefile b/testhal/STM32/STM32F37x/EXT/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/EXT/Makefile +++ b/testhal/STM32/STM32F37x/EXT/Makefile @@ -98,7 +98,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/STM32F37x/I2C/Makefile b/testhal/STM32/STM32F37x/I2C/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/I2C/Makefile +++ b/testhal/STM32/STM32F37x/I2C/Makefile @@ -98,7 +98,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/STM32F37x/IRQ_STORM/Makefile b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile index bf514cd61..be4ac6f2f 100644 --- a/testhal/STM32/STM32F37x/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile @@ -98,7 +98,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/STM32F37x/PWM-ICU/Makefile b/testhal/STM32/STM32F37x/PWM-ICU/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F37x/PWM-ICU/Makefile @@ -98,7 +98,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/STM32F37x/SDADC/Makefile b/testhal/STM32/STM32F37x/SDADC/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/SDADC/Makefile +++ b/testhal/STM32/STM32F37x/SDADC/Makefile @@ -98,7 +98,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/STM32F37x/SPI/Makefile b/testhal/STM32/STM32F37x/SPI/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/SPI/Makefile +++ b/testhal/STM32/STM32F37x/SPI/Makefile @@ -98,7 +98,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/STM32F37x/UART/Makefile b/testhal/STM32/STM32F37x/UART/Makefile index e60ee6676..8f02fb3ae 100644 --- a/testhal/STM32/STM32F37x/UART/Makefile +++ b/testhal/STM32/STM32F37x/UART/Makefile @@ -98,7 +98,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/STM32F37x/USB_CDC/Makefile b/testhal/STM32/STM32F37x/USB_CDC/Makefile index afebd0d8c..f5c8e9b3e 100644 --- a/testhal/STM32/STM32F37x/USB_CDC/Makefile +++ b/testhal/STM32/STM32F37x/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F3xx/ADC/Makefile b/testhal/STM32/STM32F3xx/ADC/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/ADC/Makefile +++ b/testhal/STM32/STM32F3xx/ADC/Makefile @@ -98,7 +98,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/STM32F3xx/ADC_DUAL/Makefile b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile +++ b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile @@ -98,7 +98,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/STM32F3xx/CAN/Makefile b/testhal/STM32/STM32F3xx/CAN/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/CAN/Makefile +++ b/testhal/STM32/STM32F3xx/CAN/Makefile @@ -98,7 +98,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/STM32F3xx/DAC/Makefile b/testhal/STM32/STM32F3xx/DAC/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/DAC/Makefile +++ b/testhal/STM32/STM32F3xx/DAC/Makefile @@ -98,7 +98,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/STM32F3xx/EXT/Makefile b/testhal/STM32/STM32F3xx/EXT/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/EXT/Makefile +++ b/testhal/STM32/STM32F3xx/EXT/Makefile @@ -98,7 +98,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/STM32F3xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile index 4f76ba68d..79d12f450 100644 --- a/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile @@ -98,7 +98,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/STM32F3xx/PWM-ICU/Makefile b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile @@ -98,7 +98,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/STM32F3xx/SPI/Makefile b/testhal/STM32/STM32F3xx/SPI/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/SPI/Makefile +++ b/testhal/STM32/STM32F3xx/SPI/Makefile @@ -98,7 +98,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/STM32F3xx/UART/Makefile b/testhal/STM32/STM32F3xx/UART/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/UART/Makefile +++ b/testhal/STM32/STM32F3xx/UART/Makefile @@ -98,7 +98,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/STM32F3xx/USB_CDC/Makefile b/testhal/STM32/STM32F3xx/USB_CDC/Makefile index abf4b36be..a9c33e07c 100644 --- a/testhal/STM32/STM32F3xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F3xx/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile index abf4b36be..a9c33e07c 100644 --- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile +++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F3xx/WDG/Makefile b/testhal/STM32/STM32F3xx/WDG/Makefile index 9a08f1441..ed46ff28f 100644 --- a/testhal/STM32/STM32F3xx/WDG/Makefile +++ b/testhal/STM32/STM32F3xx/WDG/Makefile @@ -98,7 +98,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/STM32F4xx/ADC/Makefile b/testhal/STM32/STM32F4xx/ADC/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/ADC/Makefile +++ b/testhal/STM32/STM32F4xx/ADC/Makefile @@ -98,7 +98,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/STM32F4xx/CAN/Makefile b/testhal/STM32/STM32F4xx/CAN/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/CAN/Makefile +++ b/testhal/STM32/STM32F4xx/CAN/Makefile @@ -98,7 +98,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/STM32F4xx/DAC/Makefile b/testhal/STM32/STM32F4xx/DAC/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/DAC/Makefile +++ b/testhal/STM32/STM32F4xx/DAC/Makefile @@ -98,7 +98,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/STM32F4xx/DAC_DUAL/Makefile b/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile +++ b/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile @@ -98,7 +98,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/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32/STM32F4xx/DMA_STORM/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/DMA_STORM/Makefile +++ b/testhal/STM32/STM32F4xx/DMA_STORM/Makefile @@ -98,7 +98,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/STM32F4xx/EXT/Makefile b/testhal/STM32/STM32F4xx/EXT/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/EXT/Makefile +++ b/testhal/STM32/STM32F4xx/EXT/Makefile @@ -98,7 +98,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/STM32F4xx/GPT/Makefile b/testhal/STM32/STM32F4xx/GPT/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/GPT/Makefile +++ b/testhal/STM32/STM32F4xx/GPT/Makefile @@ -98,7 +98,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/STM32F4xx/I2C/Makefile b/testhal/STM32/STM32F4xx/I2C/Makefile index 77a021fc9..e49c5aac7 100644 --- a/testhal/STM32/STM32F4xx/I2C/Makefile +++ b/testhal/STM32/STM32F4xx/I2C/Makefile @@ -98,7 +98,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/STM32F4xx/I2S/Makefile b/testhal/STM32/STM32F4xx/I2S/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/I2S/Makefile +++ b/testhal/STM32/STM32F4xx/I2S/Makefile @@ -98,7 +98,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/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile index 7251d77e2..73a83c818 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile @@ -98,7 +98,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/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile index 2ddb20146..4ab9e1ecd 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile +++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile @@ -98,7 +98,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/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32/STM32F4xx/PWM-ICU/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F4xx/PWM-ICU/Makefile @@ -98,7 +98,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/STM32F4xx/RTC/Makefile b/testhal/STM32/STM32F4xx/RTC/Makefile index d3ebd64f0..da5d5f111 100644 --- a/testhal/STM32/STM32F4xx/RTC/Makefile +++ b/testhal/STM32/STM32F4xx/RTC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F4xx/SDC/Makefile b/testhal/STM32/STM32F4xx/SDC/Makefile index aa2306048..af5f1bf52 100644 --- a/testhal/STM32/STM32F4xx/SDC/Makefile +++ b/testhal/STM32/STM32F4xx/SDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F4xx/SPI/Makefile b/testhal/STM32/STM32F4xx/SPI/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/SPI/Makefile +++ b/testhal/STM32/STM32F4xx/SPI/Makefile @@ -98,7 +98,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/STM32F4xx/UART/Makefile b/testhal/STM32/STM32F4xx/UART/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/UART/Makefile +++ b/testhal/STM32/STM32F4xx/UART/Makefile @@ -98,7 +98,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/STM32F4xx/USB_CDC/Makefile b/testhal/STM32/STM32F4xx/USB_CDC/Makefile index 2b0d5c294..2a4c0c19c 100644 --- a/testhal/STM32/STM32F4xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F4xx/USB_CDC/Makefile @@ -99,7 +99,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile index ff2efb8b3..433ed460f 100644 --- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile +++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F4xx/WDG/Makefile b/testhal/STM32/STM32F4xx/WDG/Makefile index 91b475706..d9517428c 100644 --- a/testhal/STM32/STM32F4xx/WDG/Makefile +++ b/testhal/STM32/STM32F4xx/WDG/Makefile @@ -98,7 +98,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/STM32F7xx/GPT-ADC/Makefile b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile index 50efac016..1f1d13a97 100644 --- a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile +++ b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile @@ -103,7 +103,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/STM32F7xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile index cb7c733e9..188986314 100644 --- a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile @@ -103,7 +103,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/STM32F7xx/PWM-ICU/Makefile b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile index 50efac016..1f1d13a97 100644 --- a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile @@ -103,7 +103,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/STM32F7xx/SPI/Makefile b/testhal/STM32/STM32F7xx/SPI/Makefile index 50efac016..1f1d13a97 100644 --- a/testhal/STM32/STM32F7xx/SPI/Makefile +++ b/testhal/STM32/STM32F7xx/SPI/Makefile @@ -103,7 +103,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/STM32F7xx/USB_CDC/Makefile b/testhal/STM32/STM32F7xx/USB_CDC/Makefile index 8a5a9a774..7756b7030 100644 --- a/testhal/STM32/STM32F7xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32F7xx/USB_CDC/Makefile @@ -103,7 +103,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32F7xx/USB_RAW/Makefile b/testhal/STM32/STM32F7xx/USB_RAW/Makefile index cf6257f33..e4da356fd 100644 --- a/testhal/STM32/STM32F7xx/USB_RAW/Makefile +++ b/testhal/STM32/STM32F7xx/USB_RAW/Makefile @@ -103,7 +103,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/STM32L0xx/ADC/Makefile b/testhal/STM32/STM32L0xx/ADC/Makefile index 744dee643..b37ebfa09 100644 --- a/testhal/STM32/STM32L0xx/ADC/Makefile +++ b/testhal/STM32/STM32L0xx/ADC/Makefile @@ -98,7 +98,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/STM32L0xx/EXT/Makefile b/testhal/STM32/STM32L0xx/EXT/Makefile index 744dee643..b37ebfa09 100644 --- a/testhal/STM32/STM32L0xx/EXT/Makefile +++ b/testhal/STM32/STM32L0xx/EXT/Makefile @@ -98,7 +98,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/STM32L0xx/SPI/Makefile b/testhal/STM32/STM32L0xx/SPI/Makefile index 744dee643..b37ebfa09 100644 --- a/testhal/STM32/STM32L0xx/SPI/Makefile +++ b/testhal/STM32/STM32L0xx/SPI/Makefile @@ -98,7 +98,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/STM32L0xx/USB_CDC/Makefile b/testhal/STM32/STM32L0xx/USB_CDC/Makefile index d2b278846..35192a266 100644 --- a/testhal/STM32/STM32L0xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32L0xx/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/STM32L1xx/ADC/Makefile b/testhal/STM32/STM32L1xx/ADC/Makefile index f31a82316..c69af8cfa 100644 --- a/testhal/STM32/STM32L1xx/ADC/Makefile +++ b/testhal/STM32/STM32L1xx/ADC/Makefile @@ -98,7 +98,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/STM32L1xx/DAC/Makefile b/testhal/STM32/STM32L1xx/DAC/Makefile index 850444e83..97867274f 100644 --- a/testhal/STM32/STM32L1xx/DAC/Makefile +++ b/testhal/STM32/STM32L1xx/DAC/Makefile @@ -98,7 +98,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/STM32L1xx/EXT/Makefile b/testhal/STM32/STM32L1xx/EXT/Makefile index f31a82316..c69af8cfa 100644 --- a/testhal/STM32/STM32L1xx/EXT/Makefile +++ b/testhal/STM32/STM32L1xx/EXT/Makefile @@ -98,7 +98,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/STM32L1xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile index 5fb5b1ab2..816a7eb1b 100644 --- a/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile @@ -98,7 +98,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/STM32L1xx/PWM-ICU/Makefile b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile index f31a82316..c69af8cfa 100644 --- a/testhal/STM32/STM32L1xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile @@ -98,7 +98,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/STM32L1xx/SPI/Makefile b/testhal/STM32/STM32L1xx/SPI/Makefile index f31a82316..c69af8cfa 100644 --- a/testhal/STM32/STM32L1xx/SPI/Makefile +++ b/testhal/STM32/STM32L1xx/SPI/Makefile @@ -98,7 +98,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/STM32L1xx/UART/Makefile b/testhal/STM32/STM32L1xx/UART/Makefile index f31a82316..c69af8cfa 100644 --- a/testhal/STM32/STM32L1xx/UART/Makefile +++ b/testhal/STM32/STM32L1xx/UART/Makefile @@ -98,7 +98,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/STM32L4xx/ADC/Makefile b/testhal/STM32/STM32L4xx/ADC/Makefile index 73c07ff19..15c3ccb9c 100644 --- a/testhal/STM32/STM32L4xx/ADC/Makefile +++ b/testhal/STM32/STM32L4xx/ADC/Makefile @@ -98,7 +98,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
diff --git a/testhal/STM32/STM32L4xx/CAN/Makefile b/testhal/STM32/STM32L4xx/CAN/Makefile index 73c07ff19..15c3ccb9c 100644 --- a/testhal/STM32/STM32L4xx/CAN/Makefile +++ b/testhal/STM32/STM32L4xx/CAN/Makefile @@ -98,7 +98,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
diff --git a/testhal/STM32/STM32L4xx/EXT/Makefile b/testhal/STM32/STM32L4xx/EXT/Makefile index 73c07ff19..15c3ccb9c 100644 --- a/testhal/STM32/STM32L4xx/EXT/Makefile +++ b/testhal/STM32/STM32L4xx/EXT/Makefile @@ -98,7 +98,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
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile index 73c07ff19..15c3ccb9c 100644 --- a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile +++ b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile @@ -98,7 +98,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
diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile index 797944a55..35f7fdd60 100644 --- a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile @@ -98,7 +98,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
diff --git a/testhal/STM32/STM32L4xx/USB_CDC/Makefile b/testhal/STM32/STM32L4xx/USB_CDC/Makefile index 8f6843f86..07dd8f101 100644 --- a/testhal/STM32/STM32L4xx/USB_CDC/Makefile +++ b/testhal/STM32/STM32L4xx/USB_CDC/Makefile @@ -98,7 +98,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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
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
diff --git a/testhal/STM32/multi/SPI/Makefile-stm32f091_nucleo64 b/testhal/STM32/multi/SPI/Makefile-stm32f091_nucleo64 index 4f238e94a..165953e27 100644 --- a/testhal/STM32/multi/SPI/Makefile-stm32f091_nucleo64 +++ b/testhal/STM32/multi/SPI/Makefile-stm32f091_nucleo64 @@ -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)/STM32F091xC.ld
diff --git a/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery b/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery index 2b8a07d3b..bb34d3621 100644 --- a/testhal/STM32/multi/SPI/Makefile-stm32f303_discovery +++ b/testhal/STM32/multi/SPI/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/SPI/Makefile-stm32f407_discovery b/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery index 3e4d4c1a0..0118e1b25 100644 --- a/testhal/STM32/multi/SPI/Makefile-stm32f407_discovery +++ b/testhal/STM32/multi/SPI/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/USB_CDC/Makefile-stm32f303_discovery b/testhal/STM32/multi/USB_CDC/Makefile-stm32f303_discovery index 36b9e25ac..7f6036185 100644 --- a/testhal/STM32/multi/USB_CDC/Makefile-stm32f303_discovery +++ b/testhal/STM32/multi/USB_CDC/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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/multi/USB_CDC/Makefile-stm32f407_discovery b/testhal/STM32/multi/USB_CDC/Makefile-stm32f407_discovery index 17fce1f58..2f88e393d 100644 --- a/testhal/STM32/multi/USB_CDC/Makefile-stm32f407_discovery +++ b/testhal/STM32/multi/USB_CDC/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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/multi/USB_CDC/Makefile-stm32f746_discovery b/testhal/STM32/multi/USB_CDC/Makefile-stm32f746_discovery index 026b92789..4a35f6cbb 100755 --- a/testhal/STM32/multi/USB_CDC/Makefile-stm32f746_discovery +++ b/testhal/STM32/multi/USB_CDC/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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
diff --git a/testhal/STM32/multi/USB_CDC/Makefile-stm32l476_discovery b/testhal/STM32/multi/USB_CDC/Makefile-stm32l476_discovery index be9aff4a5..0eed16249 100644 --- a/testhal/STM32/multi/USB_CDC/Makefile-stm32l476_discovery +++ b/testhal/STM32/multi/USB_CDC/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
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
|