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

12 files changed, 58 insertions, 58 deletions

diff --git a/demos/rt/RT-SPC56EL-EVB/Makefile b/demos/rt/RT-SPC56EL-EVB/Makefile
index a47bed372..1ea40628e 100644
--- a/demos/rt/RT-SPC56EL-EVB/Makefile
+++ b/demos/rt/RT-SPC56EL-EVB/Makefile
@@ -77,7 +77,7 @@ include $(CHIBIOS)/os/hal/ports/SPC5/SPC56ELxx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/SPC56EL60_LSM.ld

diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
index 92eeed690..fbc396007 100644
--- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
@@ -77,7 +77,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

diff --git a/demos/rt/RT-STM32F100-DISCOVERY/Makefile b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
index d0da0e6af..fc07197da 100644
--- a/demos/rt/RT-STM32F100-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F100-DISCOVERY/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT = $(PORTLD)/STM32F100xB.ld

diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
index fd616fc92..e235f2888 100644
--- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
+++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT = $(PORTLD)/STM32F103xB.ld

diff --git a/demos/rt/RT-STM32F303-DISCOVERY/Makefile b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
index 336898411..a271b19d6 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

diff --git a/demos/rt/RT-STM32F303-DISCOVERY/iar/ch.ewp b/demos/rt/RT-STM32F303-DISCOVERY/iar/ch.ewp
index 164dfd54d..9427f0f63 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/iar/ch.ewp
+++ b/demos/rt/RT-STM32F303-DISCOVERY/iar/ch.ewp
@@ -2396,76 +2396,76 @@
   <group>

     <name>test</name>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\test.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\test.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\test.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\test.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testbmk.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testbmk.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testbmk.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testbmk.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testdyn.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testdyn.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testdyn.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testdyn.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testevt.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testevt.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testevt.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testevt.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testheap.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testheap.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testheap.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testheap.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmbox.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmbox.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmbox.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmbox.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmsg.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmsg.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmsg.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmsg.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmtx.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmtx.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testmtx.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testmtx.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testpools.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testpools.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testpools.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testpools.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testqueues.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testqueues.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testqueues.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testqueues.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testsem.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testsem.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testsem.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testsem.h</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testthd.c</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testthd.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\..\test\testthd.h</name>

+      <name>$PROJ_DIR$\..\..\..\..\test\rt\testthd.h</name>

     </file>

   </group>

   <file>

diff --git a/demos/rt/RT-STM32F303-DISCOVERY/keil/ch.uvproj b/demos/rt/RT-STM32F303-DISCOVERY/keil/ch.uvproj
index 43b5eb854..9ef19d043 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/keil/ch.uvproj
+++ b/demos/rt/RT-STM32F303-DISCOVERY/keil/ch.uvproj
@@ -1151,122 +1151,122 @@
             <File>
               <FileName>test.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\test.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\test.c</FilePath>
             </File>
             <File>
               <FileName>test.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\test.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\test.h</FilePath>
             </File>
             <File>
               <FileName>testbmk.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testbmk.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testbmk.c</FilePath>
             </File>
             <File>
               <FileName>testbmk.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testbmk.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testbmk.h</FilePath>
             </File>
             <File>
               <FileName>testdyn.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testdyn.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testdyn.c</FilePath>
             </File>
             <File>
               <FileName>testdyn.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testdyn.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testdyn.h</FilePath>
             </File>
             <File>
               <FileName>testevt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testevt.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testevt.c</FilePath>
             </File>
             <File>
               <FileName>testevt.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testevt.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testevt.h</FilePath>
             </File>
             <File>
               <FileName>testheap.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testheap.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testheap.c</FilePath>
             </File>
             <File>
               <FileName>testheap.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testheap.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testheap.h</FilePath>
             </File>
             <File>
               <FileName>testmbox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testmbox.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmbox.c</FilePath>
             </File>
             <File>
               <FileName>testmbox.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testmbox.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmbox.h</FilePath>
             </File>
             <File>
               <FileName>testmsg.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testmsg.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmsg.c</FilePath>
             </File>
             <File>
               <FileName>testmsg.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testmsg.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmsg.h</FilePath>
             </File>
             <File>
               <FileName>testmtx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testmtx.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmtx.c</FilePath>
             </File>
             <File>
               <FileName>testmtx.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testmtx.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testmtx.h</FilePath>
             </File>
             <File>
               <FileName>testpools.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testpools.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testpools.c</FilePath>
             </File>
             <File>
               <FileName>testpools.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testpools.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testpools.h</FilePath>
             </File>
             <File>
               <FileName>testqueues.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testqueues.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testqueues.c</FilePath>
             </File>
             <File>
               <FileName>testqueues.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testqueues.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testqueues.h</FilePath>
             </File>
             <File>
               <FileName>testsem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testsem.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testsem.c</FilePath>
             </File>
             <File>
               <FileName>testsem.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testsem.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testsem.h</FilePath>
             </File>
             <File>
               <FileName>testthd.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\test\testthd.c</FilePath>
+              <FilePath>..\..\..\..\test\rt\testthd.c</FilePath>
             </File>
             <File>
               <FileName>testthd.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\test\testthd.h</FilePath>
+              <FilePath>..\..\..\..\test\rt\testthd.h</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
index 7d082d6b1..dbe974aaa 100644
--- a/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/rt/RT-STM32F373-STM32373C_EVAL/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
index f150b9fc5..3e182d0d3 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

diff --git a/demos/rt/RT-STM32F407-DISCOVERY/Makefile b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
index 2cadd4f7e..5bca8ad18 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

diff --git a/demos/rt/RT-STM32F429-DISCOVERY/Makefile b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
index 8c0198043..a66330b47 100644
--- a/demos/rt/RT-STM32F429-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F429-DISCOVERY/Makefile
@@ -82,7 +82,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F429xI.ld

diff --git a/demos/rt/RT-STM32L152-DISCOVERY/Makefile b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
index 3ee724b86..0b4ab5698 100644
--- a/demos/rt/RT-STM32L152-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32L152-DISCOVERY/Makefile
@@ -77,7 +77,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld