andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Giovanni Di Sirio 2017-10-24 14:33:48 +00:00
parent de3fbaebe6
commit bcd636ef74
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/oslib/configuration.xml
View File

@ -996,9 +996,7 @@ test_assert(p1 == NULL, "allocation not failed");]]></value>
<value /> <value />
</tags> </tags>
<code> <code>
<value><![CDATA[registered_object_t *rop; <value><![CDATA[rop = chFactoryFindObject("myobj");
rop = chFactoryFindObject("myobj");
test_assert(rop == NULL, "found");]]></value> test_assert(rop == NULL, "found");]]></value>
</code> </code>
</step> </step>
@ -1010,8 +1008,7 @@ test_assert(rop == NULL, "found");]]></value>
<value /> <value />
</tags> </tags>
<code> <code>
<value><![CDATA[registered_object_t *rop; <value><![CDATA[static uint32_t myobj = 0x55aa;
static uint32_t myobj = 0x55aa;
rop = chFactoryRegisterObject("myobj", (void *)&myobj); rop = chFactoryRegisterObject("myobj", (void *)&myobj);
test_assert(rop != NULL, "cannot register");]]></value> test_assert(rop != NULL, "cannot register");]]></value>
@ -1051,12 +1048,12 @@ test_assert(rop1->element.refs == 2, "object reference mismatch");
rop2 = (registered_object_t *)chFactoryDuplicateReference((dyn_element_t *)rop1); rop2 = (registered_object_t *)chFactoryDuplicateReference((dyn_element_t *)rop1);
test_assert(rop1 == rop2, "object reference mismatch"); test_assert(rop1 == rop2, "object reference mismatch");
test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch"); test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch");
test_assert(rop1->element.refs == 3, "object reference mismatch"); test_assert(rop2->element.refs == 3, "object reference mismatch");
chFactoryReleaseObject(rop1);
test_assert(rop->element.refs == 2, "references mismatch");
chFactoryReleaseObject(rop2); chFactoryReleaseObject(rop2);
test_assert(rop1->element.refs == 2, "references mismatch");
chFactoryReleaseObject(rop1);
test_assert(rop->element.refs == 1, "references mismatch");]]></value> test_assert(rop->element.refs == 1, "references mismatch");]]></value>
</code> </code>
</step> </step>

11
test/oslib/source/test/oslib_test_sequence_004.c
View File

@ -77,8 +77,6 @@ static void oslib_test_004_001_execute(void) {
/* [4.1.1] Retrieving a registered object by name, must not exist.*/ /* [4.1.1] Retrieving a registered object by name, must not exist.*/
test_set_step(1); test_set_step(1);
{ {
registered_object_t *rop;
rop = chFactoryFindObject("myobj"); rop = chFactoryFindObject("myobj");
test_assert(rop == NULL, "found"); test_assert(rop == NULL, "found");
} }
@ -86,7 +84,6 @@ static void oslib_test_004_001_execute(void) {
/* [4.1.2] Registering an object, it must not exists, must succeed.*/ /* [4.1.2] Registering an object, it must not exists, must succeed.*/
test_set_step(2); test_set_step(2);
{ {
registered_object_t *rop;
static uint32_t myobj = 0x55aa; static uint32_t myobj = 0x55aa;
rop = chFactoryRegisterObject("myobj", (void *)&myobj); rop = chFactoryRegisterObject("myobj", (void *)&myobj);
@ -119,12 +116,12 @@ static void oslib_test_004_001_execute(void) {
rop2 = (registered_object_t *)chFactoryDuplicateReference((dyn_element_t *)rop1); rop2 = (registered_object_t *)chFactoryDuplicateReference((dyn_element_t *)rop1);
test_assert(rop1 == rop2, "object reference mismatch"); test_assert(rop1 == rop2, "object reference mismatch");
test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch"); test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch");
test_assert(rop1->element.refs == 3, "object reference mismatch"); test_assert(rop2->element.refs == 3, "object reference mismatch");
chFactoryReleaseObject(rop1);
test_assert(rop->element.refs == 2, "references mismatch");
chFactoryReleaseObject(rop2); chFactoryReleaseObject(rop2);
test_assert(rop1->element.refs == 2, "references mismatch");
chFactoryReleaseObject(rop1);
test_assert(rop->element.refs == 1, "references mismatch"); test_assert(rop->element.refs == 1, "references mismatch");
} }