From f6ddc053fd02fec7073d60767f2b6bb0a9979623 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Mon, 23 Oct 2017 12:46:52 +0000
Subject: 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
---
 test/hal/testbuild/Makefile      | 4 +++-
 test/nil/testbuild/Makefile      | 4 +++-
 test/rt/testbuild/Makefile       | 4 +++-
 test/rt/testbuild/Makefile_win32 | 4 +++-
 test/rt/testbuild/main.c         | 6 ++++--
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'test')

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
-- 
cgit v1.2.3