Enhanced test system, not complete yet.

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

28 files changed, 167 insertions, 55 deletions

diff --git a/test/rt/source/test/rt_test_root.c b/test/rt/source/test/rt_test_root.c
index 8692e3ba1..1516c00a5 100644
--- a/test/rt/source/test/rt_test_root.c
+++ b/test/rt/source/test/rt_test_root.c
@@ -53,41 +53,49 @@
 /*===========================================================================*/

 

 /**

- * @brief   Array of all the test sequences.

+ * @brief   Array of test sequences.

  */

-const testcase_t * const *rt_test_suite[] = {

-  rt_test_sequence_001,

-  rt_test_sequence_002,

-  rt_test_sequence_003,

-  rt_test_sequence_004,

+const testsequence_t * const rt_test_suite_array[] = {

+  &rt_test_sequence_001,

+  &rt_test_sequence_002,

+  &rt_test_sequence_003,

+  &rt_test_sequence_004,

 #if (CH_CFG_USE_SEMAPHORES) || defined(__DOXYGEN__)

-  rt_test_sequence_005,

+  &rt_test_sequence_005,

 #endif

 #if (CH_CFG_USE_MUTEXES) || defined(__DOXYGEN__)

-  rt_test_sequence_006,

+  &rt_test_sequence_006,

 #endif

 #if (CH_CFG_USE_MESSAGES) || defined(__DOXYGEN__)

-  rt_test_sequence_007,

+  &rt_test_sequence_007,

 #endif

 #if (CH_CFG_USE_EVENTS) || defined(__DOXYGEN__)

-  rt_test_sequence_008,

+  &rt_test_sequence_008,

 #endif

 #if (CH_CFG_USE_MAILBOXES) || defined(__DOXYGEN__)

-  rt_test_sequence_009,

+  &rt_test_sequence_009,

 #endif

 #if (CH_CFG_USE_MEMPOOLS) || defined(__DOXYGEN__)

-  rt_test_sequence_010,

+  &rt_test_sequence_010,

 #endif

 #if (CH_CFG_USE_HEAP) || defined(__DOXYGEN__)

-  rt_test_sequence_011,

+  &rt_test_sequence_011,

 #endif

 #if (CH_CFG_USE_DYNAMIC) || defined(__DOXYGEN__)

-  rt_test_sequence_012,

+  &rt_test_sequence_012,

 #endif

-  rt_test_sequence_013,

+  &rt_test_sequence_013,

   NULL

 };

 

+/**

+ * @brief   Test suite root structure.

+ */

+const testsuite_t rt_test_suite = {

+  NULL,

+  rt_test_suite_array

+};

+

 /*===========================================================================*/

 /* Shared code.                                                              */

 /*===========================================================================*/

diff --git a/test/rt/source/test/rt_test_root.h b/test/rt/source/test/rt_test_root.h
index 81d661176..bc49d6a47 100644
--- a/test/rt/source/test/rt_test_root.h
+++ b/test/rt/source/test/rt_test_root.h
@@ -42,7 +42,7 @@
 /* External declarations.                                                    */

 /*===========================================================================*/

 

-extern const testcase_t * const *rt_test_suite[];

+extern const testsuite_t rt_test_suite;

 

 #ifdef __cplusplus

 extern "C" {

diff --git a/test/rt/source/test/rt_test_sequence_001.c b/test/rt/source/test/rt_test_sequence_001.c
index 1db1b491e..40d212848 100644
--- a/test/rt/source/test/rt_test_sequence_001.c
+++ b/test/rt/source/test/rt_test_sequence_001.c
@@ -220,10 +220,18 @@ static const testcase_t rt_test_001_002 = {
  ****************************************************************************/

 

 /**

- * @brief   Information.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_001[] = {

+const testcase_t * const rt_test_sequence_001_array[] = {

   &rt_test_001_001,

   &rt_test_001_002,

   NULL

 };

+

+/**

+ * @brief   Information.

+ */

+const testsequence_t rt_test_sequence_001 = {

+  NULL,

+  rt_test_sequence_001_array

+};

diff --git a/test/rt/source/test/rt_test_sequence_001.h b/test/rt/source/test/rt_test_sequence_001.h
index b760bda6c..80699a4fc 100644
--- a/test/rt/source/test/rt_test_sequence_001.h
+++ b/test/rt/source/test/rt_test_sequence_001.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_001_H

 #define RT_TEST_SEQUENCE_001_H

 

-extern const testcase_t * const rt_test_sequence_001[];

+extern const testsequence_t rt_test_sequence_001;

 

 #endif /* RT_TEST_SEQUENCE_001_H */

diff --git a/test/rt/source/test/rt_test_sequence_002.c b/test/rt/source/test/rt_test_sequence_002.c
index 9d82e6a48..9817d37b2 100644
--- a/test/rt/source/test/rt_test_sequence_002.c
+++ b/test/rt/source/test/rt_test_sequence_002.c
@@ -271,12 +271,20 @@ static const testcase_t rt_test_002_004 = {
  ****************************************************************************/

 

 /**

- * @brief   System layer and port interface.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_002[] = {

+const testcase_t * const rt_test_sequence_002_array[] = {

   &rt_test_002_001,

   &rt_test_002_002,

   &rt_test_002_003,

   &rt_test_002_004,

   NULL

 };

+

+/**

+ * @brief   System layer and port interface.

+ */

+const testsequence_t rt_test_sequence_002 = {

+  NULL,

+  rt_test_sequence_002_array

+};

diff --git a/test/rt/source/test/rt_test_sequence_002.h b/test/rt/source/test/rt_test_sequence_002.h
index 8575165c3..c3bf21ac7 100644
--- a/test/rt/source/test/rt_test_sequence_002.h
+++ b/test/rt/source/test/rt_test_sequence_002.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_002_H

 #define RT_TEST_SEQUENCE_002_H

 

-extern const testcase_t * const rt_test_sequence_002[];

+extern const testsequence_t rt_test_sequence_002;

 

 #endif /* RT_TEST_SEQUENCE_002_H */

diff --git a/test/rt/source/test/rt_test_sequence_003.c b/test/rt/source/test/rt_test_sequence_003.c
index b481e68c6..13efacb4e 100644
--- a/test/rt/source/test/rt_test_sequence_003.c
+++ b/test/rt/source/test/rt_test_sequence_003.c
@@ -331,9 +331,9 @@ static const testcase_t rt_test_003_004 = {
  ****************************************************************************/

 

 /**

- * @brief   Threads Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_003[] = {

+const testcase_t * const rt_test_sequence_003_array[] = {

   &rt_test_003_001,

   &rt_test_003_002,

   &rt_test_003_003,

@@ -342,3 +342,11 @@ const testcase_t * const rt_test_sequence_003[] = {
 #endif

   NULL

 };

+

+/**

+ * @brief   Threads Functionality.

+ */

+const testsequence_t rt_test_sequence_003 = {

+  NULL,

+  rt_test_sequence_003_array

+};

diff --git a/test/rt/source/test/rt_test_sequence_003.h b/test/rt/source/test/rt_test_sequence_003.h
index ac7917de2..79e820f74 100644
--- a/test/rt/source/test/rt_test_sequence_003.h
+++ b/test/rt/source/test/rt_test_sequence_003.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_003_H

 #define RT_TEST_SEQUENCE_003_H

 

-extern const testcase_t * const rt_test_sequence_003[];

+extern const testsequence_t rt_test_sequence_003;

 

 #endif /* RT_TEST_SEQUENCE_003_H */

diff --git a/test/rt/source/test/rt_test_sequence_004.c b/test/rt/source/test/rt_test_sequence_004.c
index 0b1e8646a..1ac2ba0d1 100644
--- a/test/rt/source/test/rt_test_sequence_004.c
+++ b/test/rt/source/test/rt_test_sequence_004.c
@@ -122,9 +122,17 @@ static const testcase_t rt_test_004_001 = {
  ****************************************************************************/

 

 /**

- * @brief   Suspend/Resume.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_004[] = {

+const testcase_t * const rt_test_sequence_004_array[] = {

   &rt_test_004_001,

   NULL

 };

+

+/**

+ * @brief   Suspend/Resume.

+ */

+const testsequence_t rt_test_sequence_004 = {

+  NULL,

+  rt_test_sequence_004_array

+};

diff --git a/test/rt/source/test/rt_test_sequence_004.h b/test/rt/source/test/rt_test_sequence_004.h
index 30cb4aa6b..a4b071634 100644
--- a/test/rt/source/test/rt_test_sequence_004.h
+++ b/test/rt/source/test/rt_test_sequence_004.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_004_H

 #define RT_TEST_SEQUENCE_004_H

 

-extern const testcase_t * const rt_test_sequence_004[];

+extern const testsequence_t rt_test_sequence_004;

 

 #endif /* RT_TEST_SEQUENCE_004_H */

diff --git a/test/rt/source/test/rt_test_sequence_005.c b/test/rt/source/test/rt_test_sequence_005.c
index 5005e1fc2..4f07ca0be 100644
--- a/test/rt/source/test/rt_test_sequence_005.c
+++ b/test/rt/source/test/rt_test_sequence_005.c
@@ -493,9 +493,9 @@ static const testcase_t rt_test_005_006 = {
  ****************************************************************************/

 

 /**

- * @brief   Counter and Binary Semaphores.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_005[] = {

+const testcase_t * const rt_test_sequence_005_array[] = {

   &rt_test_005_001,

   &rt_test_005_002,

   &rt_test_005_003,

@@ -505,4 +505,12 @@ const testcase_t * const rt_test_sequence_005[] = {
   NULL

 };

 

+/**

+ * @brief   Counter and Binary Semaphores.

+ */

+const testsequence_t rt_test_sequence_005 = {

+  NULL,

+  rt_test_sequence_005_array

+};

+

 #endif /* CH_CFG_USE_SEMAPHORES */

diff --git a/test/rt/source/test/rt_test_sequence_005.h b/test/rt/source/test/rt_test_sequence_005.h
index 3ef60743b..f8ad69343 100644
--- a/test/rt/source/test/rt_test_sequence_005.h
+++ b/test/rt/source/test/rt_test_sequence_005.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_005_H

 #define RT_TEST_SEQUENCE_005_H

 

-extern const testcase_t * const rt_test_sequence_005[];

+extern const testsequence_t rt_test_sequence_005;

 

 #endif /* RT_TEST_SEQUENCE_005_H */

diff --git a/test/rt/source/test/rt_test_sequence_006.c b/test/rt/source/test/rt_test_sequence_006.c
index 7c6847b51..d505455b9 100644
--- a/test/rt/source/test/rt_test_sequence_006.c
+++ b/test/rt/source/test/rt_test_sequence_006.c
@@ -1037,9 +1037,9 @@ static const testcase_t rt_test_006_009 = {
  ****************************************************************************/

 

 /**

- * @brief   Mutexes, Condition Variables and Priority Inheritance.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_006[] = {

+const testcase_t * const rt_test_sequence_006_array[] = {

   &rt_test_006_001,

 #if (CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

   &rt_test_006_002,

@@ -1066,4 +1066,12 @@ const testcase_t * const rt_test_sequence_006[] = {
   NULL

 };

 

+/**

+ * @brief   Mutexes, Condition Variables and Priority Inheritance.

+ */

+const testsequence_t rt_test_sequence_006 = {

+  NULL,

+  rt_test_sequence_006_array

+};

+

 #endif /* CH_CFG_USE_MUTEXES */

diff --git a/test/rt/source/test/rt_test_sequence_006.h b/test/rt/source/test/rt_test_sequence_006.h
index 1e6fc5f1c..5a01e1c27 100644
--- a/test/rt/source/test/rt_test_sequence_006.h
+++ b/test/rt/source/test/rt_test_sequence_006.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_006_H

 #define RT_TEST_SEQUENCE_006_H

 

-extern const testcase_t * const rt_test_sequence_006[];

+extern const testsequence_t rt_test_sequence_006;

 

 #endif /* RT_TEST_SEQUENCE_006_H */

diff --git a/test/rt/source/test/rt_test_sequence_007.c b/test/rt/source/test/rt_test_sequence_007.c
index 8344eb220..a7deda0db 100644
--- a/test/rt/source/test/rt_test_sequence_007.c
+++ b/test/rt/source/test/rt_test_sequence_007.c
@@ -113,11 +113,19 @@ static const testcase_t rt_test_007_001 = {
  ****************************************************************************/

 

 /**

- * @brief   Synchronous Messages.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_007[] = {

+const testcase_t * const rt_test_sequence_007_array[] = {

   &rt_test_007_001,

   NULL

 };

 

+/**

+ * @brief   Synchronous Messages.

+ */

+const testsequence_t rt_test_sequence_007 = {

+  NULL,

+  rt_test_sequence_007_array

+};

+

 #endif /* CH_CFG_USE_MESSAGES */

diff --git a/test/rt/source/test/rt_test_sequence_007.h b/test/rt/source/test/rt_test_sequence_007.h
index 09022befe..e1ddbec5a 100644
--- a/test/rt/source/test/rt_test_sequence_007.h
+++ b/test/rt/source/test/rt_test_sequence_007.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_007_H

 #define RT_TEST_SEQUENCE_007_H

 

-extern const testcase_t * const rt_test_sequence_007[];

+extern const testsequence_t rt_test_sequence_007;

 

 #endif /* RT_TEST_SEQUENCE_007_H */

diff --git a/test/rt/source/test/rt_test_sequence_008.c b/test/rt/source/test/rt_test_sequence_008.c
index f66180feb..96210f9e1 100644
--- a/test/rt/source/test/rt_test_sequence_008.c
+++ b/test/rt/source/test/rt_test_sequence_008.c
@@ -551,9 +551,9 @@ static const testcase_t rt_test_008_007 = {
  ****************************************************************************/

 

 /**

- * @brief   Event Sources and Event Flags.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_008[] = {

+const testcase_t * const rt_test_sequence_008_array[] = {

   &rt_test_008_001,

   &rt_test_008_002,

   &rt_test_008_003,

@@ -566,4 +566,12 @@ const testcase_t * const rt_test_sequence_008[] = {
   NULL

 };

 

+/**

+ * @brief   Event Sources and Event Flags.

+ */

+const testsequence_t rt_test_sequence_008 = {

+  NULL,

+  rt_test_sequence_008_array

+};

+

 #endif /* CH_CFG_USE_EVENTS */

diff --git a/test/rt/source/test/rt_test_sequence_008.h b/test/rt/source/test/rt_test_sequence_008.h
index 3f9c4f412..1bfa6945e 100644
--- a/test/rt/source/test/rt_test_sequence_008.h
+++ b/test/rt/source/test/rt_test_sequence_008.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_008_H

 #define RT_TEST_SEQUENCE_008_H

 

-extern const testcase_t * const rt_test_sequence_008[];

+extern const testsequence_t rt_test_sequence_008;

 

 #endif /* RT_TEST_SEQUENCE_008_H */

diff --git a/test/rt/source/test/rt_test_sequence_009.c b/test/rt/source/test/rt_test_sequence_009.c
index d43bf0fec..3fbf636e0 100644
--- a/test/rt/source/test/rt_test_sequence_009.c
+++ b/test/rt/source/test/rt_test_sequence_009.c
@@ -397,13 +397,21 @@ static const testcase_t rt_test_009_003 = {
  ****************************************************************************/

 

 /**

- * @brief   Mailboxes.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_009[] = {

+const testcase_t * const rt_test_sequence_009_array[] = {

   &rt_test_009_001,

   &rt_test_009_002,

   &rt_test_009_003,

   NULL

 };

 

+/**

+ * @brief   Mailboxes.

+ */

+const testsequence_t rt_test_sequence_009 = {

+  NULL,

+  rt_test_sequence_009_array

+};

+

 #endif /* CH_CFG_USE_MAILBOXES */

diff --git a/test/rt/source/test/rt_test_sequence_009.h b/test/rt/source/test/rt_test_sequence_009.h
index ffe13dfa1..1f42b5ea6 100644
--- a/test/rt/source/test/rt_test_sequence_009.h
+++ b/test/rt/source/test/rt_test_sequence_009.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_009_H

 #define RT_TEST_SEQUENCE_009_H

 

-extern const testcase_t * const rt_test_sequence_009[];

+extern const testsequence_t rt_test_sequence_009;

 

 #endif /* RT_TEST_SEQUENCE_009_H */

diff --git a/test/rt/source/test/rt_test_sequence_010.c b/test/rt/source/test/rt_test_sequence_010.c
index 80a81430c..dbaca139f 100644
--- a/test/rt/source/test/rt_test_sequence_010.c
+++ b/test/rt/source/test/rt_test_sequence_010.c
@@ -281,9 +281,9 @@ static const testcase_t rt_test_010_003 = {
  ****************************************************************************/

 

 /**

- * @brief   Memory Pools.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_010[] = {

+const testcase_t * const rt_test_sequence_010_array[] = {

   &rt_test_010_001,

 #if (CH_CFG_USE_SEMAPHORES) || defined(__DOXYGEN__)

   &rt_test_010_002,

@@ -294,4 +294,12 @@ const testcase_t * const rt_test_sequence_010[] = {
   NULL

 };

 

+/**

+ * @brief   Memory Pools.

+ */

+const testsequence_t rt_test_sequence_010 = {

+  NULL,

+  rt_test_sequence_010_array

+};

+

 #endif /* CH_CFG_USE_MEMPOOLS */

diff --git a/test/rt/source/test/rt_test_sequence_010.h b/test/rt/source/test/rt_test_sequence_010.h
index ed3fb97c6..f170e6c41 100644
--- a/test/rt/source/test/rt_test_sequence_010.h
+++ b/test/rt/source/test/rt_test_sequence_010.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_010_H

 #define RT_TEST_SEQUENCE_010_H

 

-extern const testcase_t * const rt_test_sequence_010[];

+extern const testsequence_t rt_test_sequence_010;

 

 #endif /* RT_TEST_SEQUENCE_010_H */

diff --git a/test/rt/source/test/rt_test_sequence_011.c b/test/rt/source/test/rt_test_sequence_011.c
index 7c4ec8a63..283a3c19f 100644
--- a/test/rt/source/test/rt_test_sequence_011.c
+++ b/test/rt/source/test/rt_test_sequence_011.c
@@ -261,12 +261,20 @@ static const testcase_t rt_test_011_002 = {
  ****************************************************************************/

 

 /**

- * @brief   Memory Heaps.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_011[] = {

+const testcase_t * const rt_test_sequence_011_array[] = {

   &rt_test_011_001,

   &rt_test_011_002,

   NULL

 };

 

+/**

+ * @brief   Memory Heaps.

+ */

+const testsequence_t rt_test_sequence_011 = {

+  NULL,

+  rt_test_sequence_011_array

+};

+

 #endif /* CH_CFG_USE_HEAP */

diff --git a/test/rt/source/test/rt_test_sequence_011.h b/test/rt/source/test/rt_test_sequence_011.h
index 2fc129c72..36a60968e 100644
--- a/test/rt/source/test/rt_test_sequence_011.h
+++ b/test/rt/source/test/rt_test_sequence_011.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_011_H

 #define RT_TEST_SEQUENCE_011_H

 

-extern const testcase_t * const rt_test_sequence_011[];

+extern const testsequence_t rt_test_sequence_011;

 

 #endif /* RT_TEST_SEQUENCE_011_H */

diff --git a/test/rt/source/test/rt_test_sequence_012.c b/test/rt/source/test/rt_test_sequence_012.c
index fd426002b..10e48e921 100644
--- a/test/rt/source/test/rt_test_sequence_012.c
+++ b/test/rt/source/test/rt_test_sequence_012.c
@@ -269,9 +269,9 @@ static const testcase_t rt_test_012_002 = {
  ****************************************************************************/

 

 /**

- * @brief   Dynamic threads.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_012[] = {

+const testcase_t * const rt_test_sequence_012_array[] = {

 #if (CH_CFG_USE_HEAP) || defined(__DOXYGEN__)

   &rt_test_012_001,

 #endif

@@ -281,4 +281,12 @@ const testcase_t * const rt_test_sequence_012[] = {
   NULL

 };

 

+/**

+ * @brief   Dynamic threads.

+ */

+const testsequence_t rt_test_sequence_012 = {

+  NULL,

+  rt_test_sequence_012_array

+};

+

 #endif /* CH_CFG_USE_DYNAMIC */

diff --git a/test/rt/source/test/rt_test_sequence_012.h b/test/rt/source/test/rt_test_sequence_012.h
index 204e4e833..3adee9c66 100644
--- a/test/rt/source/test/rt_test_sequence_012.h
+++ b/test/rt/source/test/rt_test_sequence_012.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_012_H

 #define RT_TEST_SEQUENCE_012_H

 

-extern const testcase_t * const rt_test_sequence_012[];

+extern const testsequence_t rt_test_sequence_012;

 

 #endif /* RT_TEST_SEQUENCE_012_H */

diff --git a/test/rt/source/test/rt_test_sequence_013.c b/test/rt/source/test/rt_test_sequence_013.c
index 5b413a338..13f0c3581 100644
--- a/test/rt/source/test/rt_test_sequence_013.c
+++ b/test/rt/source/test/rt_test_sequence_013.c
@@ -1000,9 +1000,9 @@ static const testcase_t rt_test_013_012 = {
  ****************************************************************************/

 

 /**

- * @brief   Benchmarks.

+ * @brief   Array of test cases.

  */

-const testcase_t * const rt_test_sequence_013[] = {

+const testcase_t * const rt_test_sequence_013_array[] = {

 #if (CH_CFG_USE_MESSAGES) || defined(__DOXYGEN__)

   &rt_test_013_001,

 #endif

@@ -1029,3 +1029,11 @@ const testcase_t * const rt_test_sequence_013[] = {
   &rt_test_013_012,

   NULL

 };

+

+/**

+ * @brief   Benchmarks.

+ */

+const testsequence_t rt_test_sequence_013 = {

+  NULL,

+  rt_test_sequence_013_array

+};

diff --git a/test/rt/source/test/rt_test_sequence_013.h b/test/rt/source/test/rt_test_sequence_013.h
index 7171c09ad..c4b3b512b 100644
--- a/test/rt/source/test/rt_test_sequence_013.h
+++ b/test/rt/source/test/rt_test_sequence_013.h
@@ -22,6 +22,6 @@
 #ifndef RT_TEST_SEQUENCE_013_H

 #define RT_TEST_SEQUENCE_013_H

 

-extern const testcase_t * const rt_test_sequence_013[];

+extern const testsequence_t rt_test_sequence_013;

 

 #endif /* RT_TEST_SEQUENCE_013_H */