From bcd636ef745d0988a945ca31b0798b743eba8314 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 24 Oct 2017 14:33:48 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10897
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 test/oslib/configuration.xml                     | 15 ++++++---------
 test/oslib/source/test/oslib_test_sequence_004.c | 11 ++++-------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/test/oslib/configuration.xml b/test/oslib/configuration.xml
index f663afc3b..c6b61dcb1 100644
--- a/test/oslib/configuration.xml
+++ b/test/oslib/configuration.xml
@@ -996,9 +996,7 @@ test_assert(p1 == NULL, "allocation not failed");]]></value>
                       <value />
                     </tags>
                     <code>
-                      <value><![CDATA[registered_object_t *rop;
-
-rop = chFactoryFindObject("myobj");
+                      <value><![CDATA[rop = chFactoryFindObject("myobj");
 test_assert(rop == NULL, "found");]]></value>
                     </code>
                   </step>
@@ -1010,8 +1008,7 @@ test_assert(rop == NULL, "found");]]></value>
                       <value />
                     </tags>
                     <code>
-                      <value><![CDATA[registered_object_t *rop;
-static uint32_t myobj = 0x55aa;
+                      <value><![CDATA[static uint32_t myobj = 0x55aa;
 
 rop = chFactoryRegisterObject("myobj", (void *)&myobj);
 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);
 test_assert(rop1 == rop2, "object reference mismatch");
 test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch");
-test_assert(rop1->element.refs == 3, "object reference mismatch");
-
-chFactoryReleaseObject(rop1);
-test_assert(rop->element.refs == 2, "references mismatch");
+test_assert(rop2->element.refs == 3, "object reference mismatch");
 
 chFactoryReleaseObject(rop2);
+test_assert(rop1->element.refs == 2, "references mismatch");
+
+chFactoryReleaseObject(rop1);
 test_assert(rop->element.refs == 1, "references mismatch");]]></value>
                     </code>
                   </step>
diff --git a/test/oslib/source/test/oslib_test_sequence_004.c b/test/oslib/source/test/oslib_test_sequence_004.c
index 38cb28358..981e92997 100644
--- a/test/oslib/source/test/oslib_test_sequence_004.c
+++ b/test/oslib/source/test/oslib_test_sequence_004.c
@@ -77,8 +77,6 @@ static void oslib_test_004_001_execute(void) {
   /* [4.1.1] Retrieving a registered object by name, must not exist.*/
   test_set_step(1);
   {
-    registered_object_t *rop;
-
     rop = chFactoryFindObject("myobj");
     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.*/
   test_set_step(2);
   {
-    registered_object_t *rop;
     static uint32_t myobj = 0x55aa;
 
     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);
     test_assert(rop1 == rop2, "object reference mismatch");
     test_assert(*(uint32_t *)(rop2->objp) == 0x55aa, "object mismatch");
-    test_assert(rop1->element.refs == 3, "object reference mismatch");
-
-    chFactoryReleaseObject(rop1);
-    test_assert(rop->element.refs == 2, "references mismatch");
+    test_assert(rop2->element.refs == 3, "object reference mismatch");
 
     chFactoryReleaseObject(rop2);
+    test_assert(rop1->element.refs == 2, "references mismatch");
+
+    chFactoryReleaseObject(rop1);
     test_assert(rop->element.refs == 1, "references mismatch");
   }
 
-- 
cgit v1.2.3