diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-19 09:16:38 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-19 09:16:38 +0000 |
| commit | 0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc (patch) | |
| tree | 2979ec33586a799a130e0db8e1228d68a78670eb /demos/STM32/NIL-STM32F303-DISCOVERY | |
| parent | 59d34439eb700f96bd6daa33b11b0092931b17b4 (diff) | |
| download | ChibiOS-0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc.tar.gz ChibiOS-0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc.tar.bz2 ChibiOS-0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc.zip | |
NIL test suite updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10864 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32/NIL-STM32F303-DISCOVERY')
| -rw-r--r-- | demos/STM32/NIL-STM32F303-DISCOVERY/Makefile | 4 | ||||
| -rw-r--r-- | demos/STM32/NIL-STM32F303-DISCOVERY/main.c | 7 |
2 files changed, 8 insertions, 3 deletions
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);
}
}
|