From 0e3a108a64d9d2ac6d820f90b35a47c2d6cad2cc Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
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/SPC5/NIL-SPC560D-EVB/.cproject | 4 +---
 demos/SPC5/NIL-SPC560D-EVB/Makefile  | 4 +++-
 demos/SPC5/NIL-SPC560D-EVB/main.c    | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'demos/SPC5')

diff --git a/demos/SPC5/NIL-SPC560D-EVB/.cproject b/demos/SPC5/NIL-SPC560D-EVB/.cproject
index f8050d811..c6a4eb529 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/.cproject
+++ b/demos/SPC5/NIL-SPC560D-EVB/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="0.665946016">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.665946016" moduleId="org.eclipse.cdt.core.settings" name="Default">
diff --git a/demos/SPC5/NIL-SPC560D-EVB/Makefile b/demos/SPC5/NIL-SPC560D-EVB/Makefile
index b2cb5f740..654323101 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/Makefile
+++ b/demos/SPC5/NIL-SPC560D-EVB/Makefile
@@ -93,7 +93,9 @@ include $(CHIBIOS)/os/hal/osal/nil/osal.mk
 include $(CHIBIOS)/os/nil/nil.mk
 include $(CHIBIOS)/os/common/ports/e200/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
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/SPC560D40.ld
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c
index 0421ddab0..c139acb11 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/main.c
+++ b/demos/SPC5/NIL-SPC560D-EVB/main.c
@@ -17,6 +17,7 @@
 #include "ch.h"
 #include "hal.h"
 #include "nil_test_root.h"
+#include "oslib_test_root.h"
 
 /*
  * LEDs blinker thread, times are in milliseconds.
@@ -109,8 +110,10 @@ THD_FUNCTION(Thread2, arg) {
 
   /* Waiting for button push and activation of the test suite.*/
   while (true) {
-    if (palReadPad(PORT_E, PE_BUTTON1))
-      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+    if (palReadPad(PORT_E, PE_BUTTON1)) {
+      test_execute((BaseSequentialStream *)&SD1, &nil_test_suite);
+      test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
+    }
     chThdSleepMilliseconds(500);
   }
 }
-- 
cgit v1.2.3