diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-07 13:11:20 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-07 13:11:20 +0000 |
| commit | 1558adfccd07da8e040ced5553680d8edfea0069 (patch) | |
| tree | 26e83c865366fe40813aac709cea2a0d63b3fce6 /test/nasa_osal | |
| parent | 1e64833ed36595dd2a00b55a30514493e4cf78fe (diff) | |
| download | ChibiOS-1558adfccd07da8e040ced5553680d8edfea0069.tar.gz ChibiOS-1558adfccd07da8e040ced5553680d8edfea0069.tar.bz2 ChibiOS-1558adfccd07da8e040ced5553680d8edfea0069.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9048 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'test/nasa_osal')
| -rw-r--r-- | test/nasa_osal/configuration.xml | 230 | ||||
| -rw-r--r-- | test/nasa_osal/source/test/test_sequence_001.c | 2 |
2 files changed, 116 insertions, 116 deletions
diff --git a/test/nasa_osal/configuration.xml b/test/nasa_osal/configuration.xml index 8d236c555..824637759 100644 --- a/test/nasa_osal/configuration.xml +++ b/test/nasa_osal/configuration.xml @@ -260,7 +260,7 @@ err = OS_TaskCreate(&tid, test_assert(err == OS_ERR_NAME_TAKEN, "name conflict not detected"); err = OS_TaskCreate(&tid, - "another running thread", + "conflicting thread", test_thread1, (uint32 *)wa_test1, sizeof wa_test1, @@ -316,43 +316,43 @@ test_assert_sequence("A", "task not executed");]]></value> <value />
</tags>
<code>
- <value><![CDATA[int32 err;
-uint32 tid1, tid2, tid3, tid4;
-
-err = OS_TaskCreate(&tid4,
- "running thread 4",
- test_thread4,
- (uint32 *)wa_test4,
- sizeof wa_test4,
- TASKS_BASE_PRIORITY - 0,
- 0);
-test_assert(err == OS_SUCCESS, "task 4 creation failed");
-
-err = OS_TaskCreate(&tid3,
- "running thread 3",
- test_thread3,
- (uint32 *)wa_test3,
- sizeof wa_test3,
- TASKS_BASE_PRIORITY - 1,
- 0);
-test_assert(err == OS_SUCCESS, "task 3 creation failed");
-
-err = OS_TaskCreate(&tid2,
- "running thread 2",
- test_thread2,
- (uint32 *)wa_test2,
- sizeof wa_test2,
- TASKS_BASE_PRIORITY - 2,
- 0);
-test_assert(err == OS_SUCCESS, "task 2 creation failed");
-
-err = OS_TaskCreate(&tid1,
- "running thread 1",
- test_thread1,
- (uint32 *)wa_test1,
- sizeof wa_test1,
- TASKS_BASE_PRIORITY - 3,
- 0);
+ <value><![CDATA[int32 err; +uint32 tid1, tid2, tid3, tid4; + +err = OS_TaskCreate(&tid4, + "running thread 4", + test_thread4, + (uint32 *)wa_test4, + sizeof wa_test4, + TASKS_BASE_PRIORITY - 0, + 0); +test_assert(err == OS_SUCCESS, "task 4 creation failed"); + +err = OS_TaskCreate(&tid3, + "running thread 3", + test_thread3, + (uint32 *)wa_test3, + sizeof wa_test3, + TASKS_BASE_PRIORITY - 1, + 0); +test_assert(err == OS_SUCCESS, "task 3 creation failed"); + +err = OS_TaskCreate(&tid2, + "running thread 2", + test_thread2, + (uint32 *)wa_test2, + sizeof wa_test2, + TASKS_BASE_PRIORITY - 2, + 0); +test_assert(err == OS_SUCCESS, "task 2 creation failed"); + +err = OS_TaskCreate(&tid1, + "running thread 1", + test_thread1, + (uint32 *)wa_test1, + sizeof wa_test1, + TASKS_BASE_PRIORITY - 3, + 0); test_assert(err == OS_SUCCESS, "task 1 creation failed");]]></value>
</code>
</step>
@@ -364,7 +364,7 @@ test_assert(err == OS_SUCCESS, "task 1 creation failed");]]></value> <value />
</tags>
<code>
- <value><![CDATA[OS_TaskDelay(5);
+ <value><![CDATA[OS_TaskDelay(5); test_assert_sequence("ABCD", "task order violation");]]></value>
</code>
</step>
@@ -376,43 +376,43 @@ test_assert_sequence("ABCD", "task order violation");]]></value> <value />
</tags>
<code>
- <value><![CDATA[int32 err;
-uint32 tid1, tid2, tid3, tid4;
-
-err = OS_TaskCreate(&tid1,
- "running thread 1",
- test_thread1,
- (uint32 *)wa_test1,
- sizeof wa_test1,
- TASKS_BASE_PRIORITY - 3,
- 0);
-test_assert(err == OS_SUCCESS, "task 1 creation failed");
-
-err = OS_TaskCreate(&tid2,
- "running thread 2",
- test_thread2,
- (uint32 *)wa_test2,
- sizeof wa_test2,
- TASKS_BASE_PRIORITY - 2,
- 0);
-test_assert(err == OS_SUCCESS, "task 2 creation failed");
-
-err = OS_TaskCreate(&tid3,
- "running thread 3",
- test_thread3,
- (uint32 *)wa_test3,
- sizeof wa_test3,
- TASKS_BASE_PRIORITY - 1,
- 0);
-test_assert(err == OS_SUCCESS, "task 3 creation failed");
-
-err = OS_TaskCreate(&tid4,
- "running thread 4",
- test_thread4,
- (uint32 *)wa_test4,
- sizeof wa_test4,
- TASKS_BASE_PRIORITY - 0,
- 0);
+ <value><![CDATA[int32 err; +uint32 tid1, tid2, tid3, tid4; + +err = OS_TaskCreate(&tid1, + "running thread 1", + test_thread1, + (uint32 *)wa_test1, + sizeof wa_test1, + TASKS_BASE_PRIORITY - 3, + 0); +test_assert(err == OS_SUCCESS, "task 1 creation failed"); + +err = OS_TaskCreate(&tid2, + "running thread 2", + test_thread2, + (uint32 *)wa_test2, + sizeof wa_test2, + TASKS_BASE_PRIORITY - 2, + 0); +test_assert(err == OS_SUCCESS, "task 2 creation failed"); + +err = OS_TaskCreate(&tid3, + "running thread 3", + test_thread3, + (uint32 *)wa_test3, + sizeof wa_test3, + TASKS_BASE_PRIORITY - 1, + 0); +test_assert(err == OS_SUCCESS, "task 3 creation failed"); + +err = OS_TaskCreate(&tid4, + "running thread 4", + test_thread4, + (uint32 *)wa_test4, + sizeof wa_test4, + TASKS_BASE_PRIORITY - 0, + 0); test_assert(err == OS_SUCCESS, "task 4 creation failed");]]></value>
</code>
</step>
@@ -424,7 +424,7 @@ test_assert(err == OS_SUCCESS, "task 4 creation failed");]]></value> <value />
</tags>
<code>
- <value><![CDATA[OS_TaskDelay(5);
+ <value><![CDATA[OS_TaskDelay(5); test_assert_sequence("ABCD", "task order violation");]]></value>
</code>
</step>
@@ -436,43 +436,43 @@ test_assert_sequence("ABCD", "task order violation");]]></value> <value />
</tags>
<code>
- <value><![CDATA[int32 err;
-uint32 tid1, tid2, tid3, tid4;
-
-err = OS_TaskCreate(&tid2,
- "running thread 2",
- test_thread2,
- (uint32 *)wa_test2,
- sizeof wa_test2,
- TASKS_BASE_PRIORITY - 2,
- 0);
-test_assert(err == OS_SUCCESS, "task 2 creation failed");
-
-err = OS_TaskCreate(&tid1,
- "running thread 1",
- test_thread1,
- (uint32 *)wa_test1,
- sizeof wa_test1,
- TASKS_BASE_PRIORITY - 3,
- 0);
-test_assert(err == OS_SUCCESS, "task 1 creation failed");
-
-err = OS_TaskCreate(&tid4,
- "running thread 4",
- test_thread4,
- (uint32 *)wa_test4,
- sizeof wa_test4,
- TASKS_BASE_PRIORITY - 0,
- 0);
-test_assert(err == OS_SUCCESS, "task 4 creation failed");
-
-err = OS_TaskCreate(&tid3,
- "running thread 3",
- test_thread3,
- (uint32 *)wa_test3,
- sizeof wa_test3,
- TASKS_BASE_PRIORITY - 1,
- 0);
+ <value><![CDATA[int32 err; +uint32 tid1, tid2, tid3, tid4; + +err = OS_TaskCreate(&tid2, + "running thread 2", + test_thread2, + (uint32 *)wa_test2, + sizeof wa_test2, + TASKS_BASE_PRIORITY - 2, + 0); +test_assert(err == OS_SUCCESS, "task 2 creation failed"); + +err = OS_TaskCreate(&tid1, + "running thread 1", + test_thread1, + (uint32 *)wa_test1, + sizeof wa_test1, + TASKS_BASE_PRIORITY - 3, + 0); +test_assert(err == OS_SUCCESS, "task 1 creation failed"); + +err = OS_TaskCreate(&tid4, + "running thread 4", + test_thread4, + (uint32 *)wa_test4, + sizeof wa_test4, + TASKS_BASE_PRIORITY - 0, + 0); +test_assert(err == OS_SUCCESS, "task 4 creation failed"); + +err = OS_TaskCreate(&tid3, + "running thread 3", + test_thread3, + (uint32 *)wa_test3, + sizeof wa_test3, + TASKS_BASE_PRIORITY - 1, + 0); test_assert(err == OS_SUCCESS, "task 3 creation failed");]]></value>
</code>
</step>
@@ -484,7 +484,7 @@ test_assert(err == OS_SUCCESS, "task 3 creation failed");]]></value> <value />
</tags>
<code>
- <value><![CDATA[OS_TaskDelay(5);
+ <value><![CDATA[OS_TaskDelay(5); test_assert_sequence("ABCD", "task order violation");]]></value>
</code>
</step>
diff --git a/test/nasa_osal/source/test/test_sequence_001.c b/test/nasa_osal/source/test/test_sequence_001.c index 7c173021e..c5863f171 100644 --- a/test/nasa_osal/source/test/test_sequence_001.c +++ b/test/nasa_osal/source/test/test_sequence_001.c @@ -232,7 +232,7 @@ static void test_001_001_execute(void) { test_assert(err == OS_ERR_NAME_TAKEN, "name conflict not detected");
err = OS_TaskCreate(&tid,
- "another running thread",
+ "conflicting thread",
test_thread1,
(uint32 *)wa_test1,
sizeof wa_test1,
|