diff options
| -rw-r--r-- | test/nil/.cproject | 2 | ||||
| -rw-r--r-- | test/nil/configuration.xml | 30 | ||||
| -rw-r--r-- | test/nil/source/test/test_sequence_004.c | 12 |
3 files changed, 22 insertions, 22 deletions
diff --git a/test/nil/.cproject b/test/nil/.cproject index d3500207c..a3d27ffcd 100644 --- a/test/nil/.cproject +++ b/test/nil/.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/nil/configuration.xml b/test/nil/configuration.xml index c8dcc54cc..e5a2fd8b6 100644 --- a/test/nil/configuration.xml +++ b/test/nil/configuration.xml @@ -661,7 +661,7 @@ test_assert_lock(mb1.rdptr == mb1.wrptr, "pointers not aligned");]]></value> test_assert(msg1 == MSG_OK, "wrong wake-up message"); test_emit_token(msg2); } -test_assert_sequence("ABCDE", "wrong get sequence");]]></value>
+test_assert_sequence("ABCD", "wrong get sequence");]]></value>
</code>
</step>
<step>
@@ -686,8 +686,8 @@ test_assert(msg1 == MSG_OK, "wrong wake-up message");]]></value> <value />
</tags>
<code>
- <value><![CDATA[test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty"); -test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full"); + <value><![CDATA[test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty"); +test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full"); test_assert(mb1.buffer == mb1.wrptr, "write pointer not aligned to base"); test_assert(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]></value>
</code>
@@ -736,8 +736,8 @@ unsigned i;]]></value> <value />
</tags>
<code>
- <value><![CDATA[chSysLock();
-chMBResetI(&mb1);
+ <value><![CDATA[chSysLock(); +chMBResetI(&mb1); chSysUnlock(); test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty"); test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full"); @@ -753,15 +753,15 @@ test_assert_lock(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]] <value />
</tags>
<code>
- <value><![CDATA[for (i = 0; i < MB_SIZE - 1; i++) {
+ <value><![CDATA[for (i = 0; i < MB_SIZE - 1; i++) { chSysLock(); msg1 = chMBPostI(&mb1, 'B' + i); - chSysUnlock();
+ chSysUnlock(); test_assert(msg1 == MSG_OK, "wrong wake-up message"); } -chSysLock();
+chSysLock(); msg1 = chMBPostAheadI(&mb1, 'A'); -chSysUnlock();
+chSysUnlock(); test_assert(msg1 == MSG_OK, "wrong wake-up message");]]></value>
</code>
</step>
@@ -787,13 +787,13 @@ test_assert_lock(mb1.rdptr == mb1.wrptr, "pointers not aligned");]]></value> </tags>
<code>
<value><![CDATA[for (i = 0; i < MB_SIZE; i++) { - chSysLock();
+ chSysLock(); msg1 = chMBFetchI(&mb1, &msg2); - chSysUnlock();
+ chSysUnlock(); test_assert(msg1 == MSG_OK, "wrong wake-up message"); test_emit_token(msg2); } -test_assert_sequence("ABCDE", "wrong get sequence");]]></value>
+test_assert_sequence("ABCD", "wrong get sequence");]]></value>
</code>
</step>
<step>
@@ -818,9 +818,9 @@ test_assert(msg1 == MSG_OK, "wrong wake-up message");]]></value> <value />
</tags>
<code>
- <value><![CDATA[test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty"); -test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full"); -test_assert(mb1.buffer == mb1.wrptr, "write pointer not aligned to base"); + <value><![CDATA[test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");
+test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");
+test_assert(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");
test_assert(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");]]></value>
</code>
</step>
diff --git a/test/nil/source/test/test_sequence_004.c b/test/nil/source/test/test_sequence_004.c index 4ee372d21..6cf37b289 100644 --- a/test/nil/source/test/test_sequence_004.c +++ b/test/nil/source/test/test_sequence_004.c @@ -134,7 +134,7 @@ static void test_004_001_execute(void) { test_assert(msg1 == MSG_OK, "wrong wake-up message");
test_emit_token(msg2);
}
- test_assert_sequence("ABCDE", "wrong get sequence");
+ test_assert_sequence("ABCD", "wrong get sequence");
}
/* Posting and then fetching one more message, no errors expected.*/
@@ -150,8 +150,8 @@ static void test_004_001_execute(void) { start, semaphore counters are checked.*/
test_set_step(7);
{
- test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty");
- test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full");
+ test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");
+ test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");
test_assert(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");
test_assert(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");
}
@@ -259,7 +259,7 @@ static void test_004_002_execute(void) { test_assert(msg1 == MSG_OK, "wrong wake-up message");
test_emit_token(msg2);
}
- test_assert_sequence("ABCDE", "wrong get sequence");
+ test_assert_sequence("ABCD", "wrong get sequence");
}
/* Posting and then fetching one more message, no errors expected.*/
@@ -275,8 +275,8 @@ static void test_004_002_execute(void) { start, semaphore counters are checked.*/
test_set_step(7);
{
- test_assert_lock(chMBGetFreeCountI(&mb1) == 0, "still empty");
- test_assert_lock(chMBGetUsedCountI(&mb1) == MB_SIZE, "not full");
+ test_assert_lock(chMBGetFreeCountI(&mb1) == MB_SIZE, "not empty");
+ test_assert_lock(chMBGetUsedCountI(&mb1) == 0, "still full");
test_assert(mb1.buffer == mb1.wrptr, "write pointer not aligned to base");
test_assert(mb1.buffer == mb1.rdptr, "read pointer not aligned to base");
}
|