Mass updated all demos with the new test code.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10886 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 8 insertions, 3 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);

   }

 }