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

9 files changed, 52 insertions, 8 deletions

diff --git a/test/nil/configuration.xml b/test/nil/configuration.xml
index c759ff4f9..87f76a7fb 100644
--- a/test/nil/configuration.xml
+++ b/test/nil/configuration.xml
@@ -962,8 +962,11 @@ test_assert(msg1 == MSG_TIMEOUT, "wrong wake-up message");]]></value>
               <value><![CDATA[#define MEMORY_POOL_SIZE 4
 
 static uint32_t objects[MEMORY_POOL_SIZE];
-static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);
+static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);

+

+#if CH_CFG_USE_SEMAPHORES
 static GUARDEDMEMORYPOOL_DECL(gmp1, sizeof (uint32_t));
+#endif

 
 static void *null_provider(size_t size, unsigned align) {
 
diff --git a/test/nil/source/test/test_root.c b/test/nil/source/test/test_root.c
index 23d4884c9..a143b6e44 100644
--- a/test/nil/source/test/test_root.c
+++ b/test/nil/source/test/test_root.c
@@ -50,11 +50,19 @@
  */

 const testcase_t * const *test_suite[] = {

   test_sequence_001,

+#if (CH_CFG_USE_SEMAPHORES) || defined(__DOXYGEN__)

   test_sequence_002,

+#endif

   test_sequence_003,

+#if (CH_CFG_USE_MAILBOXES) || defined(__DOXYGEN__)

   test_sequence_004,

+#endif

+#if (CH_CFG_USE_MEMPOOLS) || defined(__DOXYGEN__)

   test_sequence_005,

+#endif

+#if (CH_CFG_USE_HEAP) || defined(__DOXYGEN__)

   test_sequence_006,

+#endif

   NULL

 };

 

diff --git a/test/nil/source/test/test_sequence_005.c b/test/nil/source/test/test_sequence_005.c
index a9e22e0db..e95011d18 100644
--- a/test/nil/source/test/test_sequence_005.c
+++ b/test/nil/source/test/test_sequence_005.c
@@ -53,7 +53,10 @@
 
 static uint32_t objects[MEMORY_POOL_SIZE];
 static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);
+
+#if CH_CFG_USE_SEMAPHORES
 static GUARDEDMEMORYPOOL_DECL(gmp1, sizeof (uint32_t));
+#endif
 
 static void *null_provider(size_t size, unsigned align) {
 
diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml
index fda3392ee..5c3342210 100644
--- a/test/rt/configuration.xml
+++ b/test/rt/configuration.xml
@@ -3308,8 +3308,11 @@ test_assert(msg1 == MSG_TIMEOUT, "wrong wake-up message");]]></value>
               <value><![CDATA[#define MEMORY_POOL_SIZE 4
 
 static uint32_t objects[MEMORY_POOL_SIZE];
-static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);
+static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);

+
+#if CH_CFG_USE_SEMAPHORES

 static GUARDEDMEMORYPOOL_DECL(gmp1, sizeof (uint32_t));
+#endif

 
 static void *null_provider(size_t size, unsigned align) {
 
@@ -4545,8 +4548,12 @@ systime_t start, end;]]></value>
                       <value><![CDATA[n = 0;
 start = test_wait_tick();
 end = start + MS2ST(1000);
-do {
-  chThdRelease(chThdCreateStatic(wa[0], WA_SIZE, prio, bmk_thread3, NULL));
+do {

+#if CH_CFG_USE_REGISTRY
+  chThdRelease(chThdCreateStatic(wa[0], WA_SIZE, prio, bmk_thread3, NULL));

+#else

+  chThdCreateStatic(wa[0], WA_SIZE, prio, bmk_thread3, NULL);

+#endif

   n++;
 #if defined(SIMULATOR)
   _sim_check_for_interrupts();
diff --git a/test/rt/source/test/test_root.c b/test/rt/source/test/test_root.c
index 026fed32c..71e7787a8 100644
--- a/test/rt/source/test/test_root.c
+++ b/test/rt/source/test/test_root.c
@@ -58,14 +58,30 @@ const testcase_t * const *test_suite[] = {
   test_sequence_001,

   test_sequence_002,

   test_sequence_003,

+#if (CH_CFG_USE_SEMAPHORES) || defined(__DOXYGEN__)

   test_sequence_004,

+#endif

+#if (CH_CFG_USE_MUTEXES) || defined(__DOXYGEN__)

   test_sequence_005,

+#endif

+#if (CH_CFG_USE_MESSAGES) || defined(__DOXYGEN__)

   test_sequence_006,

+#endif

+#if (CH_CFG_USE_EVENTS) || defined(__DOXYGEN__)

   test_sequence_007,

+#endif

+#if (CH_CFG_USE_MAILBOXES) || defined(__DOXYGEN__)

   test_sequence_008,

+#endif

+#if (CH_CFG_USE_MEMPOOLS) || defined(__DOXYGEN__)

   test_sequence_009,

+#endif

+#if (CH_CFG_USE_HEAP) || defined(__DOXYGEN__)

   test_sequence_010,

+#endif

+#if (CH_CFG_USE_DYNAMIC) || defined(__DOXYGEN__)

   test_sequence_011,

+#endif

   test_sequence_012,

   NULL

 };

diff --git a/test/rt/source/test/test_sequence_009.c b/test/rt/source/test/test_sequence_009.c
index 975ae56ef..4d32f8a8f 100644
--- a/test/rt/source/test/test_sequence_009.c
+++ b/test/rt/source/test/test_sequence_009.c
@@ -53,7 +53,10 @@
 
 static uint32_t objects[MEMORY_POOL_SIZE];
 static MEMORYPOOL_DECL(mp1, sizeof (uint32_t), NULL);
+
+#if CH_CFG_USE_SEMAPHORES
 static GUARDEDMEMORYPOOL_DECL(gmp1, sizeof (uint32_t));
+#endif
 
 static void *null_provider(size_t size, unsigned align) {
 
diff --git a/test/rt/source/test/test_sequence_012.c b/test/rt/source/test/test_sequence_012.c
index 44ca37f2e..4405541e7 100644
--- a/test/rt/source/test/test_sequence_012.c
+++ b/test/rt/source/test/test_sequence_012.c
@@ -500,7 +500,11 @@ static void test_012_006_execute(void) {
     start = test_wait_tick();

     end = start + MS2ST(1000);

     do {

+#if CH_CFG_USE_REGISTRY

       chThdRelease(chThdCreateStatic(wa[0], WA_SIZE, prio, bmk_thread3, NULL));

+#else

+      chThdCreateStatic(wa[0], WA_SIZE, prio, bmk_thread3, NULL);

+#endif

       n++;

 #if defined(SIMULATOR)

       _sim_check_for_interrupts();

diff --git a/test/rt/testbuild/Makefile b/test/rt/testbuild/Makefile
index 795971d7b..cc4d2bfb7 100644
--- a/test/rt/testbuild/Makefile
+++ b/test/rt/testbuild/Makefile
@@ -76,8 +76,8 @@ 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)/os/hal/lib/streams/streams.mk

-include $(CHIBIOS)/os/various/shell/shell.mk

+#include $(CHIBIOS)/os/hal/lib/streams/streams.mk

+#include $(CHIBIOS)/os/various/shell/shell.mk

 

 # C sources here.

 CSRC = $(STARTUPSRC) \

diff --git a/test/rt/testbuild/go.sh b/test/rt/testbuild/go.sh
index 0dfd46a43..937e1ebde 100644
--- a/test/rt/testbuild/go.sh
+++ b/test/rt/testbuild/go.sh
@@ -12,7 +12,7 @@ function clean() {
 
 function compile() {
   echo -n "  * Building..."
-  if ! make -j4 > buildlog.txt
+  if ! make > buildlog.txt
   then
     echo "failed"
     clean
@@ -90,7 +90,7 @@ mkdir reports 2> /dev/null
 test cfg1 ""
 test cfg2 "-DCH_CFG_OPTIMIZE_SPEED=FALSE"
 test cfg3 "-DCH_CFG_TIME_QUANTUM=0"
-test cfg4 "-DCH_CFG_USE_REGISTRY=FALSE"
+test cfg4 "-DCH_CFG_USE_REGISTRY=FALSE -DCH_CFG_USE_DYNAMIC=FALSE"
 test cfg5 "-DCH_CFG_USE_TM=FALSE"
 test cfg6 "-DCH_CFG_USE_SEMAPHORES=FALSE -DCH_CFG_USE_MAILBOXES=FALSE"
 test cfg7 "-DCH_CFG_USE_SEMAPHORES_PRIORITY=TRUE"