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

5 files changed, 116 insertions, 42 deletions

diff --git a/test/nil/configuration.xml b/test/nil/configuration.xml
index f6d00873f..710e9a3be 100644
--- a/test/nil/configuration.xml
+++ b/test/nil/configuration.xml
@@ -650,6 +650,23 @@ test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]
                   </step>

                   <step>

                     <description>

+                      <value>Testing the behavior of API when the mailbox is in reset state then return in active state.</value>

+                    </description>

+                    <tags>

+                      <value />

+                    </tags>

+                    <code>

+                      <value><![CDATA[msg1 = chMBPost(&mb1, (msg_t)0, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+msg1 = chMBPostAhead(&mb1, (msg_t)0, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+chMBResumeX(&mb1);]]></value>

+                    </code>

+                  </step>

+                  <step>

+                    <description>

                       <value>Filling the mailbox using chMBPost() and chMBPostAhead() once, no errors expected.</value>

                     </description>

                     <tags>

@@ -771,7 +788,8 @@ chSysUnlock();
 test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");
 test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");
 test_assert_lock(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");
-test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]></value>

+test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

+chMBResumeX(&mb1);]]></value>

                     </code>

                   </step>

                   <step>

@@ -922,7 +940,8 @@ test_assert(msg1 == MSG_TIMEOUT, "wrong wake-up message");]]></value>
                       <value />

                     </tags>

                     <code>

-                      <value><![CDATA[chMBReset(&mb1);]]></value>

+                      <value><![CDATA[chMBReset(&mb1);;

+chMBResumeX(&mb1);]]></value>

                     </code>

                   </step>

                   <step>

diff --git a/test/nil/source/test/test_sequence_004.c b/test/nil/source/test/test_sequence_004.c
index 442aa49ba..c3f3463d3 100644
--- a/test/nil/source/test/test_sequence_004.c
+++ b/test/nil/source/test/test_sequence_004.c
@@ -70,15 +70,17 @@ static MAILBOX_DECL(mb1, mb_buffer, MB_SIZE);
  * - [4.1.1] Testing the mailbox size.

  * - [4.1.2] Resetting the mailbox, conditions are checked, no errors

  *   expected.

- * - [4.1.3] Filling the mailbox using chMBPost() and chMBPostAhead()

+ * - [4.1.3] Testing the behavior of API when the mailbox is in reset

+ *   state then return in active state.

+ * - [4.1.4] Filling the mailbox using chMBPost() and chMBPostAhead()

  *   once, no errors expected.

- * - [4.1.4] Testing intermediate conditions. Data pointers must be

+ * - [4.1.5] Testing intermediate conditions. Data pointers must be

  *   aligned, semaphore counters are checked.

- * - [4.1.5] Emptying the mailbox using chMBFetch(), no errors

+ * - [4.1.6] Emptying the mailbox using chMBFetch(), no errors

  *   expected.

- * - [4.1.6] Posting and then fetching one more message, no errors

+ * - [4.1.7] Posting and then fetching one more message, no errors

  *   expected.

- * - [4.1.7] Testing final conditions. Data pointers must be aligned to

+ * - [4.1.8] Testing final conditions. Data pointers must be aligned to

  *   buffer start, semaphore counters are checked.

  * .

  */

@@ -112,10 +114,23 @@ static void test_004_001_execute(void) {
     test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

   }

 

-  /* [4.1.3] Filling the mailbox using chMBPost() and chMBPostAhead()

-     once, no errors expected.*/

+  /* [4.1.3] Testing the behavior of API when the mailbox is in reset

+     state then return in active state.*/

   test_set_step(3);

   {

+    msg1 = chMBPost(&mb1, (msg_t)0, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    msg1 = chMBPostAhead(&mb1, (msg_t)0, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    chMBResumeX(&mb1);

+  }

+

+  /* [4.1.4] Filling the mailbox using chMBPost() and chMBPostAhead()

+     once, no errors expected.*/

+  test_set_step(4);

+  {

     for (i = 0; i < MB_SIZE - 1; i++) {

       msg1 = chMBPost(&mb1, 'B' + i, TIME_INFINITE);

       test_assert(msg1 == MSG_OK, "wrong wake-up message");

@@ -124,18 +139,18 @@ static void test_004_001_execute(void) {
     test_assert(msg1 == MSG_OK, "wrong wake-up message");

   }

 

-  /* [4.1.4] Testing intermediate conditions. Data pointers must be

+  /* [4.1.5] Testing intermediate conditions. Data pointers must be

      aligned, semaphore counters are checked.*/

-  test_set_step(4);

+  test_set_step(5);

   {

     test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty");

     test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full");

     test_assert_lock(mb1.rdptr == mb1.wrptr, "pointers not aligned");

   }

 

-  /* [4.1.5] Emptying the mailbox using chMBFetch(), no errors

+  /* [4.1.6] Emptying the mailbox using chMBFetch(), no errors

      expected.*/

-  test_set_step(5);

+  test_set_step(6);

   {

     for (i = 0; i < MB_SIZE; i++) {

       msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

@@ -145,9 +160,9 @@ static void test_004_001_execute(void) {
     test_assert_sequence("ABCD", "wrong get sequence");

   }

 

-  /* [4.1.6] Posting and then fetching one more message, no errors

+  /* [4.1.7] Posting and then fetching one more message, no errors

      expected.*/

-  test_set_step(6);

+  test_set_step(7);

   {

     msg1 = chMBPost(&mb1, 'B' + i, TIME_INFINITE);

     test_assert(msg1 == MSG_OK, "wrong wake-up message");

@@ -155,9 +170,9 @@ static void test_004_001_execute(void) {
     test_assert(msg1 == MSG_OK, "wrong wake-up message");

   }

 

-  /* [4.1.7] Testing final conditions. Data pointers must be aligned to

+  /* [4.1.8] Testing final conditions. Data pointers must be aligned to

      buffer start, semaphore counters are checked.*/

-  test_set_step(7);

+  test_set_step(8);

   {

     test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");

     test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");

@@ -226,6 +241,7 @@ static void test_004_002_execute(void) {
     test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");

     test_assert_lock(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");

     test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

+    chMBResumeX(&mb1);

   }

 

   /* [4.2.3] Filling the mailbox using chMBPostI() and chMBPostAheadI()

@@ -352,7 +368,8 @@ static void test_004_003_execute(void) {
   /* [4.3.3] Resetting the mailbox.*/

   test_set_step(3);

   {

-    chMBReset(&mb1);

+    chMBReset(&mb1);;

+    chMBResumeX(&mb1);

   }

 

   /* [4.3.4] Testing chMBFetch() and chMBFetchI() timeout.*/

diff --git a/test/rt/.cproject b/test/rt/.cproject
index e849ada7d..e92ac3785 100644
--- a/test/rt/.cproject
+++ b/test/rt/.cproject
@@ -36,8 +36,8 @@
 						</toolChain>

 					</folderInfo>

 					<sourceEntries>

-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="source"/>

 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components"/>

+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="source"/>

 					</sourceEntries>

 				</configuration>

 			</storageModule>

diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml
index f678671dc..49305faac 100644
--- a/test/rt/configuration.xml
+++ b/test/rt/configuration.xml
@@ -2985,6 +2985,23 @@ test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]
                   </step>

                   <step>

                     <description>

+                      <value>Testing the behavior of API when the mailbox is in reset state then return in active state.</value>

+                    </description>

+                    <tags>

+                      <value />

+                    </tags>

+                    <code>

+                      <value><![CDATA[msg1 = chMBPost(&mb1, (msg_t)0, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+msg1 = chMBPostAhead(&mb1, (msg_t)0, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

+test_assert(msg1 == MSG_RESET, "not in reset state");

+chMBResumeX(&mb1);]]></value>

+                    </code>

+                  </step>

+                  <step>

+                    <description>

                       <value>Filling the mailbox using chMBPost() and chMBPostAhead() once, no errors expected.</value>

                     </description>

                     <tags>

@@ -3094,7 +3111,7 @@ unsigned i;]]></value>
                   </step>

                   <step>

                     <description>

-                      <value>Resetting the mailbox, conditions are checked, no errors expected.</value>

+                      <value>Resetting the mailbox, conditions are checked, no errors expected. The mailbox is then returned in active state.</value>

                     </description>

                     <tags>

                       <value />

@@ -3106,7 +3123,8 @@ chSysUnlock();
 test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");
 test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");
 test_assert_lock(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");
-test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]></value>

+test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

+chMBResumeX(&mb1);]]></value>

                     </code>

                   </step>

                   <step>

@@ -3251,13 +3269,14 @@ test_assert(msg1 == MSG_TIMEOUT, "wrong wake-up message");]]></value>
                   </step>

                   <step>

                     <description>

-                      <value>Resetting the mailbox.</value>

+                      <value>Resetting the mailbox. The mailbox is then returned in active state.</value>

                     </description>

                     <tags>

                       <value />

                     </tags>

                     <code>

-                      <value><![CDATA[chMBReset(&mb1);]]></value>

+                      <value><![CDATA[chMBReset(&mb1);

+chMBResumeX(&mb1);]]></value>

                     </code>

                   </step>

                   <step>

diff --git a/test/rt/source/test/test_sequence_008.c b/test/rt/source/test/test_sequence_008.c
index fe8a1b93b..349e1a9d0 100644
--- a/test/rt/source/test/test_sequence_008.c
+++ b/test/rt/source/test/test_sequence_008.c
@@ -69,15 +69,17 @@ static MAILBOX_DECL(mb1, mb_buffer, MB_SIZE);
  * - [8.1.1] Testing the mailbox size.

  * - [8.1.2] Resetting the mailbox, conditions are checked, no errors

  *   expected.

- * - [8.1.3] Filling the mailbox using chMBPost() and chMBPostAhead()

+ * - [8.1.3] Testing the behavior of API when the mailbox is in reset

+ *   state then return in active state.

+ * - [8.1.4] Filling the mailbox using chMBPost() and chMBPostAhead()

  *   once, no errors expected.

- * - [8.1.4] Testing intermediate conditions. Data pointers must be

+ * - [8.1.5] Testing intermediate conditions. Data pointers must be

  *   aligned, semaphore counters are checked.

- * - [8.1.5] Emptying the mailbox using chMBFetch(), no errors

+ * - [8.1.6] Emptying the mailbox using chMBFetch(), no errors

  *   expected.

- * - [8.1.6] Posting and then fetching one more message, no errors

+ * - [8.1.7] Posting and then fetching one more message, no errors

  *   expected.

- * - [8.1.7] Testing final conditions. Data pointers must be aligned to

+ * - [8.1.8] Testing final conditions. Data pointers must be aligned to

  *   buffer start, semaphore counters are checked.

  * .

  */

@@ -111,10 +113,23 @@ static void test_008_001_execute(void) {
     test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

   }

 

-  /* [8.1.3] Filling the mailbox using chMBPost() and chMBPostAhead()

-     once, no errors expected.*/

+  /* [8.1.3] Testing the behavior of API when the mailbox is in reset

+     state then return in active state.*/

   test_set_step(3);

   {

+    msg1 = chMBPost(&mb1, (msg_t)0, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    msg1 = chMBPostAhead(&mb1, (msg_t)0, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

+    test_assert(msg1 == MSG_RESET, "not in reset state");

+    chMBResumeX(&mb1);

+  }

+

+  /* [8.1.4] Filling the mailbox using chMBPost() and chMBPostAhead()

+     once, no errors expected.*/

+  test_set_step(4);

+  {

     for (i = 0; i < MB_SIZE - 1; i++) {

       msg1 = chMBPost(&mb1, 'B' + i, TIME_INFINITE);

       test_assert(msg1 == MSG_OK, "wrong wake-up message");

@@ -123,18 +138,18 @@ static void test_008_001_execute(void) {
     test_assert(msg1 == MSG_OK, "wrong wake-up message");

   }

 

-  /* [8.1.4] Testing intermediate conditions. Data pointers must be

+  /* [8.1.5] Testing intermediate conditions. Data pointers must be

      aligned, semaphore counters are checked.*/

-  test_set_step(4);

+  test_set_step(5);

   {

     test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty");

     test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full");

     test_assert_lock(mb1.rdptr == mb1.wrptr, "pointers not aligned");

   }

 

-  /* [8.1.5] Emptying the mailbox using chMBFetch(), no errors

+  /* [8.1.6] Emptying the mailbox using chMBFetch(), no errors

      expected.*/

-  test_set_step(5);

+  test_set_step(6);

   {

     for (i = 0; i < MB_SIZE; i++) {

       msg1 = chMBFetch(&mb1, &msg2, TIME_INFINITE);

@@ -144,9 +159,9 @@ static void test_008_001_execute(void) {
     test_assert_sequence("ABCD", "wrong get sequence");

   }

 

-  /* [8.1.6] Posting and then fetching one more message, no errors

+  /* [8.1.7] Posting and then fetching one more message, no errors

      expected.*/

-  test_set_step(6);

+  test_set_step(7);

   {

     msg1 = chMBPost(&mb1, 'B' + i, TIME_INFINITE);

     test_assert(msg1 == MSG_OK, "wrong wake-up message");

@@ -154,9 +169,9 @@ static void test_008_001_execute(void) {
     test_assert(msg1 == MSG_OK, "wrong wake-up message");

   }

 

-  /* [8.1.7] Testing final conditions. Data pointers must be aligned to

+  /* [8.1.8] Testing final conditions. Data pointers must be aligned to

      buffer start, semaphore counters are checked.*/

-  test_set_step(7);

+  test_set_step(8);

   {

     test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");

     test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");

@@ -182,7 +197,7 @@ static const testcase_t test_008_001 = {
  * <h2>Test Steps</h2>

  * - [8.2.1] Testing the mailbox size.

  * - [8.2.2] Resetting the mailbox, conditions are checked, no errors

- *   expected.

+ *   expected. The mailbox is then returned in active state.

  * - [8.2.3] Filling the mailbox using chMBPostI() and chMBPostAheadI()

  *   once, no errors expected.

  * - [8.2.4] Testing intermediate conditions. Data pointers must be

@@ -215,7 +230,7 @@ static void test_008_002_execute(void) {
   }

 

   /* [8.2.2] Resetting the mailbox, conditions are checked, no errors

-     expected.*/

+     expected. The mailbox is then returned in active state.*/

   test_set_step(2);

   {

     chSysLock();

@@ -225,6 +240,7 @@ static void test_008_002_execute(void) {
     test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");

     test_assert_lock(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");

     test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");

+    chMBResumeX(&mb1);

   }

 

   /* [8.2.3] Filling the mailbox using chMBPostI() and chMBPostAheadI()

@@ -304,7 +320,8 @@ static const testcase_t test_008_002 = {
  * - [8.3.1] Filling the mailbox.

  * - [8.3.2] Testing chMBPost(), chMBPostI(), chMBPostAhead() and

  *   chMBPostAheadI() timeout.

- * - [8.3.3] Resetting the mailbox.

+ * - [8.3.3] Resetting the mailbox. The mailbox is then returned in

+ *   active state.

  * - [8.3.4] Testing chMBFetch() and chMBFetchI() timeout.

  * .

  */

@@ -348,10 +365,12 @@ static void test_008_003_execute(void) {
     test_assert(msg1 == MSG_TIMEOUT, "wrong wake-up message");

   }

 

-  /* [8.3.3] Resetting the mailbox.*/

+  /* [8.3.3] Resetting the mailbox. The mailbox is then returned in

+     active state.*/

   test_set_step(3);

   {

     chMBReset(&mb1);

+    chMBResumeX(&mb1);

   }

 

   /* [8.3.4] Testing chMBFetch() and chMBFetchI() timeout.*/