From 0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 19 Oct 2017 09:16:38 +0000 Subject: NIL test suite updated. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10864 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/NIL-STM32F051-DISCOVERY/Makefile | 4 +- demos/STM32/NIL-STM32F051-DISCOVERY/main.c | 7 +- demos/STM32/NIL-STM32F303-DISCOVERY/Makefile | 4 +- demos/STM32/NIL-STM32F303-DISCOVERY/main.c | 7 +- demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile | 4 +- ...F746G-DISCOVERY (OpenOCD, Flash and Run).launch | 104 ++++++++++----------- demos/STM32/NIL-STM32F746G-DISCOVERY/main.c | 7 +- demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h | 14 +-- 8 files changed, 83 insertions(+), 68 deletions(-) (limited to 'demos/STM32') diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile index 223ff48e6..36e81274b 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32F051-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_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/STM32/NIL-STM32F051-DISCOVERY/main.c b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c index b6cb5b30d..7e4e13e80 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "hal.h" #include "ch.h" #include "nil_test_root.h" +#include "oslib_test_root.h" /* * Thread 1. @@ -71,8 +72,10 @@ THD_FUNCTION(Thread3, arg) { /* Waiting for button push and activation of the test suite.*/ while (true) { - if (palReadLine(LINE_BUTTON)) - test_execute((BaseSequentialStream *)&SD1, &rt_test_suite); + if (palReadLine(LINE_BUTTON)) { + test_execute((BaseSequentialStream *)&SD1, &nil_test_suite); + test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite); + } chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile index f411901f8..7f996d8cc 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32F303-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)/STM32F303xC.ld diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c index 5d728ed6b..61d556a0c 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "hal.h" #include "ch.h" #include "nil_test_root.h" +#include "oslib_test_root.h" /* * Blinker thread #1. @@ -95,8 +96,10 @@ THD_FUNCTION(Thread3, arg) { /* Waiting for button push and activation of the test suite.*/ while (true) { - if (palReadLine(LINE_BUTTON)) - test_execute((BaseSequentialStream *)&SD1, &rt_test_suite); + if (palReadLine(LINE_BUTTON)) { + test_execute((BaseSequentialStream *)&SD1, &nil_test_suite); + test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite); + } chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile index 78723f75f..df211e287 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/Makefile +++ b/demos/STM32/NIL-STM32F746G-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)/STM32F746xG.ld diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch index 15b43d869..6068cf8e3 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c index 5c6552163..fb907fd6e 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c @@ -17,6 +17,7 @@ #include "hal.h" #include "ch.h" #include "nil_test_root.h" +#include "oslib_test_root.h" /* * Blinker thread #1. @@ -58,8 +59,10 @@ THD_FUNCTION(Thread2, arg) { /* Waiting for button push and activation of the test suite.*/ while (true) { - if (palReadLine(LINE_BUTTON_USER)) - test_execute((BaseSequentialStream *)&SD1, &rt_test_suite); + if (palReadLine(LINE_BUTTON_USER)) { + test_execute((BaseSequentialStream *)&SD1, &nil_test_suite); + test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite); + } chThdSleepMilliseconds(500); } } diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h index 1bda70597..d1c18aea8 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h @@ -391,7 +391,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_STATISTICS FALSE +#define CH_DBG_STATISTICS TRUE /** * @brief Debug option, system state check. @@ -400,7 +400,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_SYSTEM_STATE_CHECK FALSE +#define CH_DBG_SYSTEM_STATE_CHECK TRUE /** * @brief Debug option, parameters checks. @@ -409,7 +409,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_ENABLE_CHECKS FALSE +#define CH_DBG_ENABLE_CHECKS TRUE /** * @brief Debug option, consistency checks. @@ -419,7 +419,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_ENABLE_ASSERTS FALSE +#define CH_DBG_ENABLE_ASSERTS TRUE /** * @brief Debug option, trace buffer. @@ -427,7 +427,7 @@ * * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. */ -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED +#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_ALL /** * @brief Trace buffer entries. @@ -446,7 +446,7 @@ * @note The default failure mode is to halt the system with the global * @p panic_msg variable set to @p NULL. */ -#define CH_DBG_ENABLE_STACK_CHECK FALSE +#define CH_DBG_ENABLE_STACK_CHECK TRUE /** * @brief Debug option, stacks initialization. @@ -456,7 +456,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_FILL_THREADS FALSE +#define CH_DBG_FILL_THREADS TRUE /** * @brief Debug option, threads profiling. -- cgit v1.2.3