[rtems commit] newlib01: Edit asserts to check initialization

Sebastian Huber sebh at rtems.org
Wed Feb 16 07:18:30 UTC 2022


Module:    rtems
Branch:    master
Commit:    d24da94f620af3b8446a8305056bf690339bbeac
Changeset: http://git.rtems.org/rtems/commit/?id=d24da94f620af3b8446a8305056bf690339bbeac

Author:    Matt Joyce <matthew.joyce at embedded-brains.de>
Date:      Tue Feb 15 12:26:12 2022 +0100

newlib01: Edit asserts to check initialization

Edit assert statements in worker thread to check initialization against the
__cleanup member of struct _reent instead of __sdidinit.  This will allow the
removal of sdidinit in a follow up Newlib patch.

---

 testsuites/libtests/newlib01/init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuites/libtests/newlib01/init.c b/testsuites/libtests/newlib01/init.c
index 383abf4..c6aedde 100644
--- a/testsuites/libtests/newlib01/init.c
+++ b/testsuites/libtests/newlib01/init.c
@@ -70,7 +70,7 @@ static void worker_task(rtems_task_argument arg)
   char buf[1] = { 'x' };
   size_t n;
 
-  rtems_test_assert(reent->__sdidinit == 0);
+  rtems_test_assert(reent->__cleanup == NULL);
 
   output = stdout = fopen(&file_path[0], "r+");
   rtems_test_assert(stdout != NULL);
@@ -78,9 +78,9 @@ static void worker_task(rtems_task_argument arg)
   /*
    * Check newlib's __sinit does not touch our assigned file pointer.
    */
-  rtems_test_assert(reent->__sdidinit == 0);
+  rtems_test_assert(reent->__cleanup == NULL);
   rtems_test_assert(fflush(stdout) == 0);
-  rtems_test_assert(reent->__sdidinit != 0);
+  rtems_test_assert(reent->__cleanup != NULL);
   rtems_test_assert(stdout == output);
 
   n = fwrite(&buf[0], sizeof(buf), 1, stdout);



More information about the vc mailing list