NASA OSAL test suite reworked. Fixes to the OSAL related to the API change.

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

23 files changed, 425 insertions, 373 deletions

diff --git a/test/nasa_osal/configuration.xml b/test/nasa_osal/configuration.xml
index 4cb7755ae..24a01ea67 100644
--- a/test/nasa_osal/configuration.xml
+++ b/test/nasa_osal/configuration.xml
@@ -17,6 +17,9 @@
           </introduction>

         </description>

         <global_data_and_code>

+          <code_prefix>

+            <value>nasa_osal_</value>

+          </code_prefix>

           <global_definitions>

             <value><![CDATA[#define TEST_SUITE_NAME                     "NASA OSAL over ChibiOS/RT Test Suite"
 
diff --git a/test/nasa_osal/nasa_osal_test.mk b/test/nasa_osal/nasa_osal_test.mk
new file mode 100644
index 000000000..e0e3d3995
--- /dev/null
+++ b/test/nasa_osal/nasa_osal_test.mk
@@ -0,0 +1,11 @@
+# List of all the NASA OSAL over ChibiOS/RT test files.

+TESTSRC += ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_root.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_001.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_002.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_003.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_004.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_005.c \

+           ${CHIBIOS}/test/nasa_osal/source/test/nasa_osal_test_sequence_006.c

+

+# Required include directories

+TESTINC += ${CHIBIOS}/test/nasa_osal/source/test/

diff --git a/test/nasa_osal/source/test/test_root.c b/test/nasa_osal/source/test/nasa_osal_test_root.c
index be977e983..9245eb8a7 100644
--- a/test/nasa_osal/source/test/test_root.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_root.c
@@ -7,23 +7,22 @@
  * converge to 100% code coverage through successive improvements.

  *

  * <h2>Test Sequences</h2>

- * - @subpage test_sequence_001

- * - @subpage test_sequence_002

- * - @subpage test_sequence_003

- * - @subpage test_sequence_004

- * - @subpage test_sequence_005

- * - @subpage test_sequence_006

+ * - @subpage nasa_osal_test_sequence_001

+ * - @subpage nasa_osal_test_sequence_002

+ * - @subpage nasa_osal_test_sequence_003

+ * - @subpage nasa_osal_test_sequence_004

+ * - @subpage nasa_osal_test_sequence_005

+ * - @subpage nasa_osal_test_sequence_006

  * .

  */

 

 /**

- * @file    test_root.c

+ * @file    nasa_osal_test_root.c

  * @brief   Test Suite root structures code.

  */

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 #if !defined(__DOXYGEN__)

 

@@ -32,18 +31,26 @@
 /*===========================================================================*/

 

 /**

- * @brief   Array of all the test sequences.

+ * @brief   Array of test sequences.

  */

-const testcase_t * const *test_suite[] = {

-  test_sequence_001,

-  test_sequence_002,

-  test_sequence_003,

-  test_sequence_004,

-  test_sequence_005,

-  test_sequence_006,

+const testsequence_t * const nasa_osal_test_suite_array[] = {

+  &nasa_osal_test_sequence_001,

+  &nasa_osal_test_sequence_002,

+  &nasa_osal_test_sequence_003,

+  &nasa_osal_test_sequence_004,

+  &nasa_osal_test_sequence_005,

+  &nasa_osal_test_sequence_006,

   NULL

 };

 

+/**

+ * @brief   Test suite root structure.

+ */

+const testsuite_t nasa_osal_test_suite = {

+  "Test specification for the NASA OSAL ChibiOS extension.",

+  nasa_osal_test_suite_array

+};

+

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

 /* Shared code.                                                              */

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

diff --git a/test/nasa_osal/source/test/test_root.h b/test/nasa_osal/source/test/nasa_osal_test_root.h
index eb6fbb801..88bad5dde 100644
--- a/test/nasa_osal/source/test/test_root.h
+++ b/test/nasa_osal/source/test/nasa_osal_test_root.h
@@ -1,19 +1,21 @@
 /* Copyright statement.*/

 

 /**

- * @file    test_root.h

+ * @file    nasa_osal_test_root.h

  * @brief   Test Suite root structures header.

  */

 

-#ifndef TEST_ROOT_H

-#define TEST_ROOT_H

+#ifndef NASA_OSAL_TEST_ROOT_H

+#define NASA_OSAL_TEST_ROOT_H

 

-#include "test_sequence_001.h"

-#include "test_sequence_002.h"

-#include "test_sequence_003.h"

-#include "test_sequence_004.h"

-#include "test_sequence_005.h"

-#include "test_sequence_006.h"

+#include "ch_test.h"

+

+#include "nasa_osal_test_sequence_001.h"

+#include "nasa_osal_test_sequence_002.h"

+#include "nasa_osal_test_sequence_003.h"

+#include "nasa_osal_test_sequence_004.h"

+#include "nasa_osal_test_sequence_005.h"

+#include "nasa_osal_test_sequence_006.h"

 

 #if !defined(__DOXYGEN__)

 

@@ -21,7 +23,7 @@
 /* External declarations.                                                    */

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

 

-extern const testcase_t * const *test_suite[];

+extern const testsuite_t nasa_osal_test_suite;

 

 #ifdef __cplusplus

 extern "C" {

@@ -46,4 +48,4 @@ extern THD_WORKING_AREA(wa_test4, TASKS_STACK_SIZE);
 

 #endif /* !defined(__DOXYGEN__) */

 

-#endif /* TEST_ROOT_H */

+#endif /* NASA_OSAL_TEST_ROOT_H */

diff --git a/test/nasa_osal/source/test/test_sequence_001.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_001.c
index 95bbeee8a..b26f9911c 100644
--- a/test/nasa_osal/source/test/test_sequence_001.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_001.c
@@ -1,26 +1,25 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_001.c

+ * @file    nasa_osal_test_sequence_001.c

  * @brief   Test Sequence 001 code.

  *

- * @page test_sequence_001 [1] Tasks Functionality

+ * @page nasa_osal_test_sequence_001 [1] Tasks Functionality

  *

- * File: @ref test_sequence_001.c

+ * File: @ref nasa_osal_test_sequence_001.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to threading.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_001_001

- * - @subpage test_001_002

- * - @subpage test_001_003

- * - @subpage test_001_004

+ * - @subpage nasa_osal_test_001_001

+ * - @subpage nasa_osal_test_001_002

+ * - @subpage nasa_osal_test_001_003

+ * - @subpage nasa_osal_test_001_004

  * .

  */

 

@@ -70,7 +69,7 @@ static void test_task_delete(void) {
  ****************************************************************************/

 

 /**

- * @page test_001_001 [1.1] OS_TaskCreate() errors

+ * @page nasa_osal_test_001_001 [1.1] OS_TaskCreate() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_TaskCreate() is tested.

@@ -93,7 +92,7 @@ static void test_task_delete(void) {
  * .

  */

 

-static void test_001_001_execute(void) {

+static void nasa_osal_test_001_001_execute(void) {

 

   /* [1.1.1] OS_TaskCreate() is invoked with task_id set to NULL, an

      error is expected.*/

@@ -265,15 +264,15 @@ static void test_001_001_execute(void) {
   }

 }

 

-static const testcase_t test_001_001 = {

+static const testcase_t nasa_osal_test_001_001 = {

   "OS_TaskCreate() errors",

   NULL,

   NULL,

-  test_001_001_execute

+  nasa_osal_test_001_001_execute

 };

 

 /**

- * @page test_001_002 [1.2] OS_TaskCreate() priority ordering

+ * @page nasa_osal_test_001_002 [1.2] OS_TaskCreate() priority ordering

  *

  * <h2>Description</h2>

  * Four tasks are created at different priorities and in different

@@ -293,7 +292,7 @@ static const testcase_t test_001_001 = {
  * .

  */

 

-static void test_001_002_execute(void) {

+static void nasa_osal_test_001_002_execute(void) {

 

   /* [1.2.1] Four tasks are created in priority order from low to

      high.*/

@@ -451,15 +450,15 @@ static void test_001_002_execute(void) {
   }

 }

 

-static const testcase_t test_001_002 = {

+static const testcase_t nasa_osal_test_001_002 = {

   "OS_TaskCreate() priority ordering",

   NULL,

   NULL,

-  test_001_002_execute

+  nasa_osal_test_001_002_execute

 };

 

 /**

- * @page test_001_003 [1.3] OS_TaskDelete() errors

+ * @page nasa_osal_test_001_003 [1.3] OS_TaskDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_TaskDelete() is tested.

@@ -470,7 +469,7 @@ static const testcase_t test_001_002 = {
  * .

  */

 

-static void test_001_003_execute(void) {

+static void nasa_osal_test_001_003_execute(void) {

 

   /* [1.3.1] OS_TaskDelete() is invoked with task_id set to -1, an

      error is expected.*/

@@ -483,15 +482,15 @@ static void test_001_003_execute(void) {
   }

 }

 

-static const testcase_t test_001_003 = {

+static const testcase_t nasa_osal_test_001_003 = {

   "OS_TaskDelete() errors",

   NULL,

   NULL,

-  test_001_003_execute

+  nasa_osal_test_001_003_execute

 };

 

 /**

- * @page test_001_004 [1.4] OS_TaskDelete() and OS_TaskInstallDeleteHandler() functionality

+ * @page nasa_osal_test_001_004 [1.4] OS_TaskDelete() and OS_TaskInstallDeleteHandler() functionality

  *

  * <h2>Description</h2>

  * OS_TaskDelete() and OS_TaskInstallDeleteHandler() are tested for

@@ -504,7 +503,7 @@ static const testcase_t test_001_003 = {
  * .

  */

 

-static void test_001_004_execute(void) {

+static void nasa_osal_test_001_004_execute(void) {

   uint32 tid;

 

   /* [1.4.1] Creating a task executing an infinite loop.*/

@@ -535,11 +534,11 @@ static void test_001_004_execute(void) {
   }

 }

 

-static const testcase_t test_001_004 = {

+static const testcase_t nasa_osal_test_001_004 = {

   "OS_TaskDelete() and OS_TaskInstallDeleteHandler() functionality",

   NULL,

   NULL,

-  test_001_004_execute

+  nasa_osal_test_001_004_execute

 };

 

 /****************************************************************************

@@ -547,12 +546,20 @@ static const testcase_t test_001_004 = {
  ****************************************************************************/

 

 /**

- * @brief   Tasks Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_001[] = {

-  &test_001_001,

-  &test_001_002,

-  &test_001_003,

-  &test_001_004,

+const testcase_t * const nasa_osal_test_sequence_001_array[] = {

+  &nasa_osal_test_001_001,

+  &nasa_osal_test_001_002,

+  &nasa_osal_test_001_003,

+  &nasa_osal_test_001_004,

   NULL

 };

+

+/**

+ * @brief   Tasks Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_001 = {

+  "Tasks Functionality",

+  nasa_osal_test_sequence_001_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_001.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_001.h
new file mode 100644
index 000000000..4365c302f
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_001.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_001.h

+ * @brief   Test Sequence 001 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_001_H

+#define NASA_OSAL_TEST_SEQUENCE_001_H

+

+extern const testsequence_t nasa_osal_test_sequence_001;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_001_H */

diff --git a/test/nasa_osal/source/test/test_sequence_002.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_002.c
index a993de35c..392e70211 100644
--- a/test/nasa_osal/source/test/test_sequence_002.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_002.c
@@ -1,26 +1,25 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_002.c

+ * @file    nasa_osal_test_sequence_002.c

  * @brief   Test Sequence 002 code.

  *

- * @page test_sequence_002 [2] Queues Functionality

+ * @page nasa_osal_test_sequence_002 [2] Queues Functionality

  *

- * File: @ref test_sequence_002.c

+ * File: @ref nasa_osal_test_sequence_002.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to queues.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_002_001

- * - @subpage test_002_002

- * - @subpage test_002_003

- * - @subpage test_002_004

+ * - @subpage nasa_osal_test_002_001

+ * - @subpage nasa_osal_test_002_002

+ * - @subpage nasa_osal_test_002_003

+ * - @subpage nasa_osal_test_002_004

  * .

  */

 

@@ -54,7 +53,7 @@ static void test_task_writer(void) {
  ****************************************************************************/

 

 /**

- * @page test_002_001 [2.1] OS_QueueCreate() and OS_QueueDelete() errors

+ * @page nasa_osal_test_002_001 [2.1] OS_QueueCreate() and OS_QueueDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_QueueCreate() and OS_QueueDelete() is

@@ -75,7 +74,7 @@ static void test_task_writer(void) {
  * .

  */

 

-static void test_002_001_execute(void) {

+static void nasa_osal_test_002_001_execute(void) {

 

   /* [2.1.1] OS_QueueCreate() is invoked with queue_id set to NULL, an

      error is expected.*/

@@ -150,15 +149,15 @@ static void test_002_001_execute(void) {
   }

 }

 

-static const testcase_t test_002_001 = {

+static const testcase_t nasa_osal_test_002_001 = {

   "OS_QueueCreate() and OS_QueueDelete() errors",

   NULL,

   NULL,

-  test_002_001_execute

+  nasa_osal_test_002_001_execute

 };

 

 /**

- * @page test_002_002 [2.2] OS_QueueGetIdByName() errors

+ * @page nasa_osal_test_002_002 [2.2] OS_QueueGetIdByName() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_QueueGetIdByName() is tested.

@@ -173,7 +172,7 @@ static const testcase_t test_002_001 = {
  * .

  */

 

-static void test_002_002_execute(void) {

+static void nasa_osal_test_002_002_execute(void) {

 

   /* [2.2.1] OS_QueueGetIdByName() is invoked with queue_id set to

      NULL, an error is expected.*/

@@ -206,15 +205,15 @@ static void test_002_002_execute(void) {
   }

 }

 

-static const testcase_t test_002_002 = {

+static const testcase_t nasa_osal_test_002_002 = {

   "OS_QueueGetIdByName() errors",

   NULL,

   NULL,

-  test_002_002_execute

+  nasa_osal_test_002_002_execute

 };

 

 /**

- * @page test_002_003 [2.3] OS_QueuePut() and OS_QueueGet() functionality

+ * @page nasa_osal_test_002_003 [2.3] OS_QueuePut() and OS_QueueGet() functionality

  *

  * <h2>Description</h2>

  * A task writes on a queue, the messages are retrieved on the other

@@ -228,12 +227,12 @@ static const testcase_t test_002_002 = {
  * .

  */

 

-static void test_002_003_setup(void) {

+static void nasa_osal_test_002_003_setup(void) {

   qid = 0;

   tid = 0;

 }

 

-static void test_002_003_teardown(void) {

+static void nasa_osal_test_002_003_teardown(void) {

   if (qid != 0) {

     (void) OS_QueueDelete(qid);

   }

@@ -243,7 +242,7 @@ static void test_002_003_teardown(void) {
   }

 }

 

-static void test_002_003_execute(void) {

+static void nasa_osal_test_002_003_execute(void) {

   uint32 tid;

   unsigned i;

 

@@ -295,15 +294,15 @@ static void test_002_003_execute(void) {
   }

 }

 

-static const testcase_t test_002_003 = {

+static const testcase_t nasa_osal_test_002_003 = {

   "OS_QueuePut() and OS_QueueGet() functionality",

-  test_002_003_setup,

-  test_002_003_teardown,

-  test_002_003_execute

+  nasa_osal_test_002_003_setup,

+  nasa_osal_test_002_003_teardown,

+  nasa_osal_test_002_003_execute

 };

 

 /**

- * @page test_002_004 [2.4] OS_QueueGet() with timeout functionality

+ * @page nasa_osal_test_002_004 [2.4] OS_QueueGet() with timeout functionality

  *

  * <h2>Description</h2>

  * OS_QueueGet() timeout functionality is tested.

@@ -316,18 +315,18 @@ static const testcase_t test_002_003 = {
  * .

  */

 

-static void test_002_004_setup(void) {

+static void nasa_osal_test_002_004_setup(void) {

   qid = 0;

   (void) OS_QueueCreate(&qid, "test queue", 2, MESSAGE_SIZE, 0);

 }

 

-static void test_002_004_teardown(void) {

+static void nasa_osal_test_002_004_teardown(void) {

   if (qid != 0) {

     OS_QueueDelete(qid);

   }

 }

 

-static void test_002_004_execute(void) {

+static void nasa_osal_test_002_004_execute(void) {

   uint32 local_qid;

   uint32 copied;

   char data[MESSAGE_SIZE];

@@ -362,11 +361,11 @@ static void test_002_004_execute(void) {
   }

 }

 

-static const testcase_t test_002_004 = {

+static const testcase_t nasa_osal_test_002_004 = {

   "OS_QueueGet() with timeout functionality",

-  test_002_004_setup,

-  test_002_004_teardown,

-  test_002_004_execute

+  nasa_osal_test_002_004_setup,

+  nasa_osal_test_002_004_teardown,

+  nasa_osal_test_002_004_execute

 };

 

 /****************************************************************************

@@ -374,12 +373,20 @@ static const testcase_t test_002_004 = {
  ****************************************************************************/

 

 /**

- * @brief   Queues Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_002[] = {

-  &test_002_001,

-  &test_002_002,

-  &test_002_003,

-  &test_002_004,

+const testcase_t * const nasa_osal_test_sequence_002_array[] = {

+  &nasa_osal_test_002_001,

+  &nasa_osal_test_002_002,

+  &nasa_osal_test_002_003,

+  &nasa_osal_test_002_004,

   NULL

 };

+

+/**

+ * @brief   Queues Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_002 = {

+  "Queues Functionality",

+  nasa_osal_test_sequence_002_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_002.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_002.h
new file mode 100644
index 000000000..5fdff098c
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_002.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_002.h

+ * @brief   Test Sequence 002 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_002_H

+#define NASA_OSAL_TEST_SEQUENCE_002_H

+

+extern const testsequence_t nasa_osal_test_sequence_002;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_002_H */

diff --git a/test/nasa_osal/source/test/test_sequence_003.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_003.c
index c49e7395e..699ad0f60 100644
--- a/test/nasa_osal/source/test/test_sequence_003.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_003.c
@@ -1,27 +1,26 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_003.c

+ * @file    nasa_osal_test_sequence_003.c

  * @brief   Test Sequence 003 code.

  *

- * @page test_sequence_003 [3] Timers Functionality

+ * @page nasa_osal_test_sequence_003 [3] Timers Functionality

  *

- * File: @ref test_sequence_003.c

+ * File: @ref nasa_osal_test_sequence_003.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to timers.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_003_001

- * - @subpage test_003_002

- * - @subpage test_003_003

- * - @subpage test_003_004

- * - @subpage test_003_005

+ * - @subpage nasa_osal_test_003_001

+ * - @subpage nasa_osal_test_003_002

+ * - @subpage nasa_osal_test_003_003

+ * - @subpage nasa_osal_test_003_004

+ * - @subpage nasa_osal_test_003_005

  * .

  */

 

@@ -48,7 +47,7 @@ static void tmr_callback(uint32 timer_id) {
  ****************************************************************************/

 

 /**

- * @page test_003_001 [3.1] OS_TimerCreate() and OS_TimerDelete() errors

+ * @page nasa_osal_test_003_001 [3.1] OS_TimerCreate() and OS_TimerDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_TimerCreate() and OS_TimerDelete() is

@@ -73,7 +72,7 @@ static void tmr_callback(uint32 timer_id) {
  * .

  */

 

-static void test_003_001_execute(void) {

+static void nasa_osal_test_003_001_execute(void) {

 

   /* [3.1.1] OS_TimerCreate() is invoked with timer_id set to NULL, an

      error is expected.*/

@@ -178,15 +177,15 @@ static void test_003_001_execute(void) {
   }

 }

 

-static const testcase_t test_003_001 = {

+static const testcase_t nasa_osal_test_003_001 = {

   "OS_TimerCreate() and OS_TimerDelete() errors",

   NULL,

   NULL,

-  test_003_001_execute

+  nasa_osal_test_003_001_execute

 };

 

 /**

- * @page test_003_002 [3.2] OS_TimerSet() errors

+ * @page nasa_osal_test_003_002 [3.2] OS_TimerSet() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_TimerSet() is tested.

@@ -197,7 +196,7 @@ static const testcase_t test_003_001 = {
  * .

  */

 

-static void test_003_002_execute(void) {

+static void nasa_osal_test_003_002_execute(void) {

 

   /* [3.2.1] OS_TimerSet() is invoked with timer_id set to -1, an error

      is expected.*/

@@ -210,15 +209,15 @@ static void test_003_002_execute(void) {
   }

 }

 

-static const testcase_t test_003_002 = {

+static const testcase_t nasa_osal_test_003_002 = {

   "OS_TimerSet() errors",

   NULL,

   NULL,

-  test_003_002_execute

+  nasa_osal_test_003_002_execute

 };

 

 /**

- * @page test_003_003 [3.3] OS_TimerGetIdByName() errors

+ * @page nasa_osal_test_003_003 [3.3] OS_TimerGetIdByName() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_TimerGetIdByName() is tested.

@@ -233,7 +232,7 @@ static const testcase_t test_003_002 = {
  * .

  */

 

-static void test_003_003_execute(void) {

+static void nasa_osal_test_003_003_execute(void) {

 

   /* [3.3.1] OS_TimerGetIdByName() is invoked with timer_id set to

      NULL, an error is expected.*/

@@ -266,15 +265,15 @@ static void test_003_003_execute(void) {
   }

 }

 

-static const testcase_t test_003_003 = {

+static const testcase_t nasa_osal_test_003_003 = {

   "OS_TimerGetIdByName() errors",

   NULL,

   NULL,

-  test_003_003_execute

+  nasa_osal_test_003_003_execute

 };

 

 /**

- * @page test_003_004 [3.4] OS_TimerSet() one-shot functionality

+ * @page nasa_osal_test_003_004 [3.4] OS_TimerSet() one-shot functionality

  *

  * <h2>Description</h2>

  * A timer is tested in one-shot mode.

@@ -286,7 +285,7 @@ static const testcase_t test_003_003 = {
  * .

  */

 

-static void test_003_004_setup(void) {

+static void nasa_osal_test_003_004_setup(void) {

   uint32 accuracy;

 

   cnt = 0;

@@ -294,13 +293,13 @@ static void test_003_004_setup(void) {
   (void) OS_TimerCreate(&tmid, "test timer", &accuracy, tmr_callback);

 }

 

-static void test_003_004_teardown(void) {

+static void nasa_osal_test_003_004_teardown(void) {

   if (tmid != 0) {

     (void) OS_TimerDelete(tmid);

   }

 }

 

-static void test_003_004_execute(void) {

+static void nasa_osal_test_003_004_execute(void) {

   uint32 local_tmid;

 

   /* [3.4.1] Retrieving the timer by name.*/

@@ -329,15 +328,15 @@ static void test_003_004_execute(void) {
   }

 }

 

-static const testcase_t test_003_004 = {

+static const testcase_t nasa_osal_test_003_004 = {

   "OS_TimerSet() one-shot functionality",

-  test_003_004_setup,

-  test_003_004_teardown,

-  test_003_004_execute

+  nasa_osal_test_003_004_setup,

+  nasa_osal_test_003_004_teardown,

+  nasa_osal_test_003_004_execute

 };

 

 /**

- * @page test_003_005 [3.5] OS_TimerSet() periodic functionality

+ * @page nasa_osal_test_003_005 [3.5] OS_TimerSet() periodic functionality

  *

  * <h2>Description</h2>

  * A timer is tested in periodic mode.

@@ -350,7 +349,7 @@ static const testcase_t test_003_004 = {
  * .

  */

 

-static void test_003_005_setup(void) {

+static void nasa_osal_test_003_005_setup(void) {

   uint32 accuracy;

 

   cnt = 0;

@@ -358,14 +357,14 @@ static void test_003_005_setup(void) {
   (void) OS_TimerCreate(&tmid, "test timer", &accuracy, tmr_callback);

 }

 

-static void test_003_005_teardown(void) {

+static void nasa_osal_test_003_005_teardown(void) {

   if (tmid != 0) {

     (void) OS_TimerSet(tmid, 0, 0);

     (void) OS_TimerDelete(tmid);

   }

 }

 

-static void test_003_005_execute(void) {

+static void nasa_osal_test_003_005_execute(void) {

   uint32 local_tmid;

 

   /* [3.5.1] Retrieving the timer by name.*/

@@ -403,11 +402,11 @@ static void test_003_005_execute(void) {
   }

 }

 

-static const testcase_t test_003_005 = {

+static const testcase_t nasa_osal_test_003_005 = {

   "OS_TimerSet() periodic functionality",

-  test_003_005_setup,

-  test_003_005_teardown,

-  test_003_005_execute

+  nasa_osal_test_003_005_setup,

+  nasa_osal_test_003_005_teardown,

+  nasa_osal_test_003_005_execute

 };

 

 /****************************************************************************

@@ -415,13 +414,21 @@ static const testcase_t test_003_005 = {
  ****************************************************************************/

 

 /**

- * @brief   Timers Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_003[] = {

-  &test_003_001,

-  &test_003_002,

-  &test_003_003,

-  &test_003_004,

-  &test_003_005,

+const testcase_t * const nasa_osal_test_sequence_003_array[] = {

+  &nasa_osal_test_003_001,

+  &nasa_osal_test_003_002,

+  &nasa_osal_test_003_003,

+  &nasa_osal_test_003_004,

+  &nasa_osal_test_003_005,

   NULL

 };

+

+/**

+ * @brief   Timers Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_003 = {

+  "Timers Functionality",

+  nasa_osal_test_sequence_003_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_003.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_003.h
new file mode 100644
index 000000000..f22851524
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_003.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_003.h

+ * @brief   Test Sequence 003 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_003_H

+#define NASA_OSAL_TEST_SEQUENCE_003_H

+

+extern const testsequence_t nasa_osal_test_sequence_003;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_003_H */

diff --git a/test/nasa_osal/source/test/test_sequence_004.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_004.c
index b342d845a..e9f346d06 100644
--- a/test/nasa_osal/source/test/test_sequence_004.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_004.c
@@ -1,29 +1,28 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_004.c

+ * @file    nasa_osal_test_sequence_004.c

  * @brief   Test Sequence 004 code.

  *

- * @page test_sequence_004 [4] Binary Semaphores Functionality

+ * @page nasa_osal_test_sequence_004 [4] Binary Semaphores Functionality

  *

- * File: @ref test_sequence_004.c

+ * File: @ref nasa_osal_test_sequence_004.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to binary semaphores.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_004_001

- * - @subpage test_004_002

- * - @subpage test_004_003

- * - @subpage test_004_004

- * - @subpage test_004_005

- * - @subpage test_004_006

- * - @subpage test_004_007

+ * - @subpage nasa_osal_test_004_001

+ * - @subpage nasa_osal_test_004_002

+ * - @subpage nasa_osal_test_004_003

+ * - @subpage nasa_osal_test_004_004

+ * - @subpage nasa_osal_test_004_005

+ * - @subpage nasa_osal_test_004_006

+ * - @subpage nasa_osal_test_004_007

  * .

  */

 

@@ -40,7 +39,7 @@ uint32 bsid;
  ****************************************************************************/

 

 /**

- * @page test_004_001 [4.1] OS_BinSemCreate() and OS_BinSemDelete() errors

+ * @page nasa_osal_test_004_001 [4.1] OS_BinSemCreate() and OS_BinSemDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemCreate() and OS_BinSemDelete() is

@@ -63,7 +62,7 @@ uint32 bsid;
  * .

  */

 

-static void test_004_001_execute(void) {

+static void nasa_osal_test_004_001_execute(void) {

 

   /* [4.1.1] OS_BinSemCreate() is invoked with sem_id set to NULL, an

      error is expected.*/

@@ -150,15 +149,15 @@ static void test_004_001_execute(void) {
   }

 }

 

-static const testcase_t test_004_001 = {

+static const testcase_t nasa_osal_test_004_001 = {

   "OS_BinSemCreate() and OS_BinSemDelete() errors",

   NULL,

   NULL,

-  test_004_001_execute

+  nasa_osal_test_004_001_execute

 };

 

 /**

- * @page test_004_002 [4.2] OS_BinSemFlush() errors

+ * @page nasa_osal_test_004_002 [4.2] OS_BinSemFlush() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemFlush() is tested.

@@ -169,7 +168,7 @@ static const testcase_t test_004_001 = {
  * .

  */

 

-static void test_004_002_execute(void) {

+static void nasa_osal_test_004_002_execute(void) {

 

   /* [4.2.1] OS_BinSemFlush() is invoked with sem_id set to -1, an

      error is expected.*/

@@ -182,15 +181,15 @@ static void test_004_002_execute(void) {
   }

 }

 

-static const testcase_t test_004_002 = {

+static const testcase_t nasa_osal_test_004_002 = {

   "OS_BinSemFlush() errors",

   NULL,

   NULL,

-  test_004_002_execute

+  nasa_osal_test_004_002_execute

 };

 

 /**

- * @page test_004_003 [4.3] OS_BinSemGive() errors

+ * @page nasa_osal_test_004_003 [4.3] OS_BinSemGive() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemGive() is tested.

@@ -201,7 +200,7 @@ static const testcase_t test_004_002 = {
  * .

  */

 

-static void test_004_003_execute(void) {

+static void nasa_osal_test_004_003_execute(void) {

 

   /* [4.3.1] OS_BinSemGive() is invoked with sem_id set to -1, an error

      is expected.*/

@@ -214,15 +213,15 @@ static void test_004_003_execute(void) {
   }

 }

 

-static const testcase_t test_004_003 = {

+static const testcase_t nasa_osal_test_004_003 = {

   "OS_BinSemGive() errors",

   NULL,

   NULL,

-  test_004_003_execute

+  nasa_osal_test_004_003_execute

 };

 

 /**

- * @page test_004_004 [4.4] OS_BinSemTake() errors

+ * @page nasa_osal_test_004_004 [4.4] OS_BinSemTake() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemTake() is tested.

@@ -233,7 +232,7 @@ static const testcase_t test_004_003 = {
  * .

  */

 

-static void test_004_004_execute(void) {

+static void nasa_osal_test_004_004_execute(void) {

 

   /* [4.4.1] OS_BinSemTake() is invoked with sem_id set to -1, an error

      is expected.*/

@@ -246,15 +245,15 @@ static void test_004_004_execute(void) {
   }

 }

 

-static const testcase_t test_004_004 = {

+static const testcase_t nasa_osal_test_004_004 = {

   "OS_BinSemTake() errors",

   NULL,

   NULL,

-  test_004_004_execute

+  nasa_osal_test_004_004_execute

 };

 

 /**

- * @page test_004_005 [4.5] OS_BinSemTimedWait() errors

+ * @page nasa_osal_test_004_005 [4.5] OS_BinSemTimedWait() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemTimedWait() is tested.

@@ -267,18 +266,18 @@ static const testcase_t test_004_004 = {
  * .

  */

 

-static void test_004_005_setup(void) {

+static void nasa_osal_test_004_005_setup(void) {

   bsid = 0;

   (void) OS_BinSemCreate(&bsid, "test semaphore", 0, 0);

 }

 

-static void test_004_005_teardown(void) {

+static void nasa_osal_test_004_005_teardown(void) {

   if (bsid > 0) {

     (void) OS_BinSemDelete(bsid);

   }

 }

 

-static void test_004_005_execute(void) {

+static void nasa_osal_test_004_005_execute(void) {

 

   /* [4.5.1] OS_BinSemTimedWait() is invoked with sem_id set to -1, an

      error is expected.*/

@@ -301,15 +300,15 @@ static void test_004_005_execute(void) {
   }

 }

 

-static const testcase_t test_004_005 = {

+static const testcase_t nasa_osal_test_004_005 = {

   "OS_BinSemTimedWait() errors",

-  test_004_005_setup,

-  test_004_005_teardown,

-  test_004_005_execute

+  nasa_osal_test_004_005_setup,

+  nasa_osal_test_004_005_teardown,

+  nasa_osal_test_004_005_execute

 };

 

 /**

- * @page test_004_006 [4.6] OS_BinSemGetIdByName() errors

+ * @page nasa_osal_test_004_006 [4.6] OS_BinSemGetIdByName() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_BinSemGetIdByName() is tested.

@@ -324,7 +323,7 @@ static const testcase_t test_004_005 = {
  * .

  */

 

-static void test_004_006_execute(void) {

+static void nasa_osal_test_004_006_execute(void) {

 

   /* [4.6.1] OS_BinSemGetIdByName() is invoked with sem_id set to NULL,

      an error is expected.*/

@@ -357,15 +356,15 @@ static void test_004_006_execute(void) {
   }

 }

 

-static const testcase_t test_004_006 = {

+static const testcase_t nasa_osal_test_004_006 = {

   "OS_BinSemGetIdByName() errors",

   NULL,

   NULL,

-  test_004_006_execute

+  nasa_osal_test_004_006_execute

 };

 

 /**

- * @page test_004_007 [4.7] OS_BinSemTimedWait() timeout functionality

+ * @page nasa_osal_test_004_007 [4.7] OS_BinSemTimedWait() timeout functionality

  *

  * <h2>Description</h2>

  * OS_BinSemCreate() timeout functionality is tested.

@@ -376,18 +375,18 @@ static const testcase_t test_004_006 = {
  * .

  */

 

-static void test_004_007_setup(void) {

+static void nasa_osal_test_004_007_setup(void) {

   bsid = 0;

   (void) OS_BinSemCreate(&bsid, "test semaphore", 0, 0);

 }

 

-static void test_004_007_teardown(void) {

+static void nasa_osal_test_004_007_teardown(void) {

   if (bsid > 0) {

     (void) OS_BinSemDelete(bsid);

   }

 }

 

-static void test_004_007_execute(void) {

+static void nasa_osal_test_004_007_execute(void) {

 

   /* [4.7.1] OS_BinSemTimedWait() is invoked with timeout set to one

      second, an error is expected.*/

@@ -400,11 +399,11 @@ static void test_004_007_execute(void) {
   }

 }

 

-static const testcase_t test_004_007 = {

+static const testcase_t nasa_osal_test_004_007 = {

   "OS_BinSemTimedWait() timeout functionality",

-  test_004_007_setup,

-  test_004_007_teardown,

-  test_004_007_execute

+  nasa_osal_test_004_007_setup,

+  nasa_osal_test_004_007_teardown,

+  nasa_osal_test_004_007_execute

 };

 

 /****************************************************************************

@@ -412,15 +411,23 @@ static const testcase_t test_004_007 = {
  ****************************************************************************/

 

 /**

- * @brief   Binary Semaphores Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_004[] = {

-  &test_004_001,

-  &test_004_002,

-  &test_004_003,

-  &test_004_004,

-  &test_004_005,

-  &test_004_006,

-  &test_004_007,

+const testcase_t * const nasa_osal_test_sequence_004_array[] = {

+  &nasa_osal_test_004_001,

+  &nasa_osal_test_004_002,

+  &nasa_osal_test_004_003,

+  &nasa_osal_test_004_004,

+  &nasa_osal_test_004_005,

+  &nasa_osal_test_004_006,

+  &nasa_osal_test_004_007,

   NULL

 };

+

+/**

+ * @brief   Binary Semaphores Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_004 = {

+  "Binary Semaphores Functionality",

+  nasa_osal_test_sequence_004_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_004.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_004.h
new file mode 100644
index 000000000..7c9da8393
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_004.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_004.h

+ * @brief   Test Sequence 004 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_004_H

+#define NASA_OSAL_TEST_SEQUENCE_004_H

+

+extern const testsequence_t nasa_osal_test_sequence_004;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_004_H */

diff --git a/test/nasa_osal/source/test/test_sequence_005.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_005.c
index 8d9773ec7..ad0aecd18 100644
--- a/test/nasa_osal/source/test/test_sequence_005.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_005.c
@@ -1,28 +1,27 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_005.c

+ * @file    nasa_osal_test_sequence_005.c

  * @brief   Test Sequence 005 code.

  *

- * @page test_sequence_005 [5] Counter Semaphores Functionality

+ * @page nasa_osal_test_sequence_005 [5] Counter Semaphores Functionality

  *

- * File: @ref test_sequence_005.c

+ * File: @ref nasa_osal_test_sequence_005.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to counter semaphores.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_005_001

- * - @subpage test_005_002

- * - @subpage test_005_003

- * - @subpage test_005_004

- * - @subpage test_005_005

- * - @subpage test_005_006

+ * - @subpage nasa_osal_test_005_001

+ * - @subpage nasa_osal_test_005_002

+ * - @subpage nasa_osal_test_005_003

+ * - @subpage nasa_osal_test_005_004

+ * - @subpage nasa_osal_test_005_005

+ * - @subpage nasa_osal_test_005_006

  * .

  */

 

@@ -39,7 +38,7 @@ uint32 csid;
  ****************************************************************************/

 

 /**

- * @page test_005_001 [5.1] OS_CountSemCreate() and OS_CountSemDelete() errors

+ * @page nasa_osal_test_005_001 [5.1] OS_CountSemCreate() and OS_CountSemDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_CountSemCreate() and OS_CountSemDelete()

@@ -62,7 +61,7 @@ uint32 csid;
  * .

  */

 

-static void test_005_001_execute(void) {

+static void nasa_osal_test_005_001_execute(void) {

 

   /* [5.1.1] OS_CountSemCreate() is invoked with sem_id set to NULL, an

      error is expected.*/

@@ -149,15 +148,15 @@ static void test_005_001_execute(void) {
   }

 }

 

-static const testcase_t test_005_001 = {

+static const testcase_t nasa_osal_test_005_001 = {

   "OS_CountSemCreate() and OS_CountSemDelete() errors",

   NULL,

   NULL,

-  test_005_001_execute

+  nasa_osal_test_005_001_execute

 };

 

 /**

- * @page test_005_002 [5.2] OS_CountSemGive() errors

+ * @page nasa_osal_test_005_002 [5.2] OS_CountSemGive() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_CountSemGive() is tested.

@@ -168,7 +167,7 @@ static const testcase_t test_005_001 = {
  * .

  */

 

-static void test_005_002_execute(void) {

+static void nasa_osal_test_005_002_execute(void) {

 

   /* [5.2.1] OS_CountSemGive() is invoked with sem_id set to -1, an

      error is expected.*/

@@ -181,15 +180,15 @@ static void test_005_002_execute(void) {
   }

 }

 

-static const testcase_t test_005_002 = {

+static const testcase_t nasa_osal_test_005_002 = {

   "OS_CountSemGive() errors",

   NULL,

   NULL,

-  test_005_002_execute

+  nasa_osal_test_005_002_execute

 };

 

 /**

- * @page test_005_003 [5.3] OS_CountSemTake() errors

+ * @page nasa_osal_test_005_003 [5.3] OS_CountSemTake() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_CountSemTake() is tested.

@@ -200,7 +199,7 @@ static const testcase_t test_005_002 = {
  * .

  */

 

-static void test_005_003_execute(void) {

+static void nasa_osal_test_005_003_execute(void) {

 

   /* [5.3.1] OS_CountSemTake() is invoked with sem_id set to -1, an

      error is expected.*/

@@ -213,15 +212,15 @@ static void test_005_003_execute(void) {
   }

 }

 

-static const testcase_t test_005_003 = {

+static const testcase_t nasa_osal_test_005_003 = {

   "OS_CountSemTake() errors",

   NULL,

   NULL,

-  test_005_003_execute

+  nasa_osal_test_005_003_execute

 };

 

 /**

- * @page test_005_004 [5.4] OS_CountSemTimedWait() errors

+ * @page nasa_osal_test_005_004 [5.4] OS_CountSemTimedWait() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_CountSemTimedWait() is tested.

@@ -234,18 +233,18 @@ static const testcase_t test_005_003 = {
  * .

  */

 

-static void test_005_004_setup(void) {

+static void nasa_osal_test_005_004_setup(void) {

   csid = 0;

   (void) OS_CountSemCreate(&csid, "test semaphore", 0, 0);

 }

 

-static void test_005_004_teardown(void) {

+static void nasa_osal_test_005_004_teardown(void) {

   if (csid > 0) {

     (void) OS_CountSemDelete(csid);

   }

 }

 

-static void test_005_004_execute(void) {

+static void nasa_osal_test_005_004_execute(void) {

 

   /* [5.4.1] OS_CountSemTimedWait() is invoked with sem_id set to -1,

      an error is expected.*/

@@ -268,15 +267,15 @@ static void test_005_004_execute(void) {
   }

 }

 

-static const testcase_t test_005_004 = {

+static const testcase_t nasa_osal_test_005_004 = {

   "OS_CountSemTimedWait() errors",

-  test_005_004_setup,

-  test_005_004_teardown,

-  test_005_004_execute

+  nasa_osal_test_005_004_setup,

+  nasa_osal_test_005_004_teardown,

+  nasa_osal_test_005_004_execute

 };

 

 /**

- * @page test_005_005 [5.5] OS_CountSemGetIdByName() errors

+ * @page nasa_osal_test_005_005 [5.5] OS_CountSemGetIdByName() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_CountSemGetIdByName() is tested.

@@ -291,7 +290,7 @@ static const testcase_t test_005_004 = {
  * .

  */

 

-static void test_005_005_execute(void) {

+static void nasa_osal_test_005_005_execute(void) {

 

   /* [5.5.1] OS_CountSemGetIdByName() is invoked with sem_id set to

      NULL, an error is expected.*/

@@ -324,15 +323,15 @@ static void test_005_005_execute(void) {
   }

 }

 

-static const testcase_t test_005_005 = {

+static const testcase_t nasa_osal_test_005_005 = {

   "OS_CountSemGetIdByName() errors",

   NULL,

   NULL,

-  test_005_005_execute

+  nasa_osal_test_005_005_execute

 };

 

 /**

- * @page test_005_006 [5.6] OS_CountSemTimedWait() timeout functionality

+ * @page nasa_osal_test_005_006 [5.6] OS_CountSemTimedWait() timeout functionality

  *

  * <h2>Description</h2>

  * OS_CountSemCreate() timeout functionality is tested.

@@ -343,18 +342,18 @@ static const testcase_t test_005_005 = {
  * .

  */

 

-static void test_005_006_setup(void) {

+static void nasa_osal_test_005_006_setup(void) {

   csid = 0;

   (void) OS_CountSemCreate(&csid, "test semaphore", 0, 0);

 }

 

-static void test_005_006_teardown(void) {

+static void nasa_osal_test_005_006_teardown(void) {

   if (csid > 0) {

     (void) OS_CountSemDelete(csid);

   }

 }

 

-static void test_005_006_execute(void) {

+static void nasa_osal_test_005_006_execute(void) {

 

   /* [5.6.1] OS_CountSemTimedWait() is invoked with timeout set to one

      second, an error is expected.*/

@@ -367,11 +366,11 @@ static void test_005_006_execute(void) {
   }

 }

 

-static const testcase_t test_005_006 = {

+static const testcase_t nasa_osal_test_005_006 = {

   "OS_CountSemTimedWait() timeout functionality",

-  test_005_006_setup,

-  test_005_006_teardown,

-  test_005_006_execute

+  nasa_osal_test_005_006_setup,

+  nasa_osal_test_005_006_teardown,

+  nasa_osal_test_005_006_execute

 };

 

 /****************************************************************************

@@ -379,14 +378,22 @@ static const testcase_t test_005_006 = {
  ****************************************************************************/

 

 /**

- * @brief   Counter Semaphores Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_005[] = {

-  &test_005_001,

-  &test_005_002,

-  &test_005_003,

-  &test_005_004,

-  &test_005_005,

-  &test_005_006,

+const testcase_t * const nasa_osal_test_sequence_005_array[] = {

+  &nasa_osal_test_005_001,

+  &nasa_osal_test_005_002,

+  &nasa_osal_test_005_003,

+  &nasa_osal_test_005_004,

+  &nasa_osal_test_005_005,

+  &nasa_osal_test_005_006,

   NULL

 };

+

+/**

+ * @brief   Counter Semaphores Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_005 = {

+  "Counter Semaphores Functionality",

+  nasa_osal_test_sequence_005_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_005.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_005.h
new file mode 100644
index 000000000..36ea7b226
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_005.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_005.h

+ * @brief   Test Sequence 005 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_005_H

+#define NASA_OSAL_TEST_SEQUENCE_005_H

+

+extern const testsequence_t nasa_osal_test_sequence_005;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_005_H */

diff --git a/test/nasa_osal/source/test/test_sequence_006.c b/test/nasa_osal/source/test/nasa_osal_test_sequence_006.c
index 0e6ccec06..dd6f017cb 100644
--- a/test/nasa_osal/source/test/test_sequence_006.c
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_006.c
@@ -1,26 +1,25 @@
 /* Copyright statement.*/

 

 #include "hal.h"

-#include "ch_test.h"

-#include "test_root.h"

+#include "nasa_osal_test_root.h"

 

 /**

- * @file    test_sequence_006.c

+ * @file    nasa_osal_test_sequence_006.c

  * @brief   Test Sequence 006 code.

  *

- * @page test_sequence_006 [6] Mutex Semaphores Functionality

+ * @page nasa_osal_test_sequence_006 [6] Mutex Semaphores Functionality

  *

- * File: @ref test_sequence_006.c

+ * File: @ref nasa_osal_test_sequence_006.c

  *

  * <h2>Description</h2>

  * This sequence tests the NASA OSAL over ChibiOS/RT functionalities

  * related to mutex semaphores.

  *

  * <h2>Test Cases</h2>

- * - @subpage test_006_001

- * - @subpage test_006_002

- * - @subpage test_006_003

- * - @subpage test_006_004

+ * - @subpage nasa_osal_test_006_001

+ * - @subpage nasa_osal_test_006_002

+ * - @subpage nasa_osal_test_006_003

+ * - @subpage nasa_osal_test_006_004

  * .

  */

 

@@ -37,7 +36,7 @@ uint32 msid;
  ****************************************************************************/

 

 /**

- * @page test_006_001 [6.1] OS_MutSemCreate() and OS_MutSemDelete() errors

+ * @page nasa_osal_test_006_001 [6.1] OS_MutSemCreate() and OS_MutSemDelete() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_MutSemCreate() and OS_MutSemDelete() is

@@ -58,7 +57,7 @@ uint32 msid;
  * .

  */

 

-static void test_006_001_execute(void) {

+static void nasa_osal_test_006_001_execute(void) {

 

   /* [6.1.1] OS_MutSemCreate() is invoked with sem_id set to NULL, an

      error is expected.*/

@@ -129,15 +128,15 @@ static void test_006_001_execute(void) {
   }

 }

 

-static const testcase_t test_006_001 = {

+static const testcase_t nasa_osal_test_006_001 = {

   "OS_MutSemCreate() and OS_MutSemDelete() errors",

   NULL,

   NULL,

-  test_006_001_execute

+  nasa_osal_test_006_001_execute

 };

 

 /**

- * @page test_006_002 [6.2] OS_MutSemGive() errors

+ * @page nasa_osal_test_006_002 [6.2] OS_MutSemGive() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_MutSemGive() is tested.

@@ -148,7 +147,7 @@ static const testcase_t test_006_001 = {
  * .

  */

 

-static void test_006_002_execute(void) {

+static void nasa_osal_test_006_002_execute(void) {

 

   /* [6.2.1] OS_MutSemGive() is invoked with sem_id set to -1, an error

      is expected.*/

@@ -161,15 +160,15 @@ static void test_006_002_execute(void) {
   }

 }

 

-static const testcase_t test_006_002 = {

+static const testcase_t nasa_osal_test_006_002 = {

   "OS_MutSemGive() errors",

   NULL,

   NULL,

-  test_006_002_execute

+  nasa_osal_test_006_002_execute

 };

 

 /**

- * @page test_006_003 [6.3] OS_MutSemTake() errors

+ * @page nasa_osal_test_006_003 [6.3] OS_MutSemTake() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_MutSemTake() is tested.

@@ -180,7 +179,7 @@ static const testcase_t test_006_002 = {
  * .

  */

 

-static void test_006_003_execute(void) {

+static void nasa_osal_test_006_003_execute(void) {

 

   /* [6.3.1] OS_MutSemTake() is invoked with sem_id set to -1, an error

      is expected.*/

@@ -193,15 +192,15 @@ static void test_006_003_execute(void) {
   }

 }

 

-static const testcase_t test_006_003 = {

+static const testcase_t nasa_osal_test_006_003 = {

   "OS_MutSemTake() errors",

   NULL,

   NULL,

-  test_006_003_execute

+  nasa_osal_test_006_003_execute

 };

 

 /**

- * @page test_006_004 [6.4] OS_MutSemGetIdByName() errors

+ * @page nasa_osal_test_006_004 [6.4] OS_MutSemGetIdByName() errors

  *

  * <h2>Description</h2>

  * Parameters checking in OS_MutSemGetIdByName() is tested.

@@ -216,7 +215,7 @@ static const testcase_t test_006_003 = {
  * .

  */

 

-static void test_006_004_execute(void) {

+static void nasa_osal_test_006_004_execute(void) {

 

   /* [6.4.1] OS_MutSemGetIdByName() is invoked with sem_id set to NULL,

      an error is expected.*/

@@ -249,11 +248,11 @@ static void test_006_004_execute(void) {
   }

 }

 

-static const testcase_t test_006_004 = {

+static const testcase_t nasa_osal_test_006_004 = {

   "OS_MutSemGetIdByName() errors",

   NULL,

   NULL,

-  test_006_004_execute

+  nasa_osal_test_006_004_execute

 };

 

 /****************************************************************************

@@ -261,12 +260,20 @@ static const testcase_t test_006_004 = {
  ****************************************************************************/

 

 /**

- * @brief   Mutex Semaphores Functionality.

+ * @brief   Array of test cases.

  */

-const testcase_t * const test_sequence_006[] = {

-  &test_006_001,

-  &test_006_002,

-  &test_006_003,

-  &test_006_004,

+const testcase_t * const nasa_osal_test_sequence_006_array[] = {

+  &nasa_osal_test_006_001,

+  &nasa_osal_test_006_002,

+  &nasa_osal_test_006_003,

+  &nasa_osal_test_006_004,

   NULL

 };

+

+/**

+ * @brief   Mutex Semaphores Functionality.

+ */

+const testsequence_t nasa_osal_test_sequence_006 = {

+  "Mutex Semaphores Functionality",

+  nasa_osal_test_sequence_006_array

+};

diff --git a/test/nasa_osal/source/test/nasa_osal_test_sequence_006.h b/test/nasa_osal/source/test/nasa_osal_test_sequence_006.h
new file mode 100644
index 000000000..70959ba9d
--- /dev/null
+++ b/test/nasa_osal/source/test/nasa_osal_test_sequence_006.h
@@ -0,0 +1,13 @@
+/* Copyright statement.*/

+

+/**

+ * @file    nasa_osal_test_sequence_006.h

+ * @brief   Test Sequence 006 header.

+ */

+

+#ifndef NASA_OSAL_TEST_SEQUENCE_006_H

+#define NASA_OSAL_TEST_SEQUENCE_006_H

+

+extern const testsequence_t nasa_osal_test_sequence_006;

+

+#endif /* NASA_OSAL_TEST_SEQUENCE_006_H */

diff --git a/test/nasa_osal/source/test/test_sequence_001.h b/test/nasa_osal/source/test/test_sequence_001.h
deleted file mode 100644
index 080660f74..000000000
--- a/test/nasa_osal/source/test/test_sequence_001.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_001.h

- * @brief   Test Sequence 001 header.

- */

-

-#ifndef TEST_SEQUENCE_001_H

-#define TEST_SEQUENCE_001_H

-

-extern const testcase_t * const test_sequence_001[];

-

-#endif /* TEST_SEQUENCE_001_H */

diff --git a/test/nasa_osal/source/test/test_sequence_002.h b/test/nasa_osal/source/test/test_sequence_002.h
deleted file mode 100644
index 56a3d36d7..000000000
--- a/test/nasa_osal/source/test/test_sequence_002.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_002.h

- * @brief   Test Sequence 002 header.

- */

-

-#ifndef TEST_SEQUENCE_002_H

-#define TEST_SEQUENCE_002_H

-

-extern const testcase_t * const test_sequence_002[];

-

-#endif /* TEST_SEQUENCE_002_H */

diff --git a/test/nasa_osal/source/test/test_sequence_003.h b/test/nasa_osal/source/test/test_sequence_003.h
deleted file mode 100644
index 82f40587f..000000000
--- a/test/nasa_osal/source/test/test_sequence_003.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_003.h

- * @brief   Test Sequence 003 header.

- */

-

-#ifndef TEST_SEQUENCE_003_H

-#define TEST_SEQUENCE_003_H

-

-extern const testcase_t * const test_sequence_003[];

-

-#endif /* TEST_SEQUENCE_003_H */

diff --git a/test/nasa_osal/source/test/test_sequence_004.h b/test/nasa_osal/source/test/test_sequence_004.h
deleted file mode 100644
index b34358d46..000000000
--- a/test/nasa_osal/source/test/test_sequence_004.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_004.h

- * @brief   Test Sequence 004 header.

- */

-

-#ifndef TEST_SEQUENCE_004_H

-#define TEST_SEQUENCE_004_H

-

-extern const testcase_t * const test_sequence_004[];

-

-#endif /* TEST_SEQUENCE_004_H */

diff --git a/test/nasa_osal/source/test/test_sequence_005.h b/test/nasa_osal/source/test/test_sequence_005.h
deleted file mode 100644
index 11aed54c1..000000000
--- a/test/nasa_osal/source/test/test_sequence_005.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_005.h

- * @brief   Test Sequence 005 header.

- */

-

-#ifndef TEST_SEQUENCE_005_H

-#define TEST_SEQUENCE_005_H

-

-extern const testcase_t * const test_sequence_005[];

-

-#endif /* TEST_SEQUENCE_005_H */

diff --git a/test/nasa_osal/source/test/test_sequence_006.h b/test/nasa_osal/source/test/test_sequence_006.h
deleted file mode 100644
index a4f3bc211..000000000
--- a/test/nasa_osal/source/test/test_sequence_006.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright statement.*/

-

-/**

- * @file    test_sequence_006.h

- * @brief   Test Sequence 006 header.

- */

-

-#ifndef TEST_SEQUENCE_006_H

-#define TEST_SEQUENCE_006_H

-

-extern const testcase_t * const test_sequence_006[];

-

-#endif /* TEST_SEQUENCE_006_H */

diff --git a/test/nasa_osal/test.mk b/test/nasa_osal/test.mk
deleted file mode 100644
index cf9a9cdb7..000000000
--- a/test/nasa_osal/test.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# List of all the NASA OSAL over ChibiOS/RT test files.

-TESTSRC = ${CHIBIOS}/test/lib/ch_test.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_root.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_001.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_002.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_003.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_004.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_005.c \

-          ${CHIBIOS}/test/nasa_osal/source/test/test_sequence_006.c

-

-# Required include directories

-TESTINC = ${CHIBIOS}/test/lib \

-          ${CHIBIOS}/test/nasa_osal/source/test/