diff options
author | Chris Johns <chrisj@rtems.org> | 2018-04-12 17:48:28 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2018-04-12 17:59:46 +1000 |
commit | 696b9121a2b7ec80464d13c723e6c780a3e5608c (patch) | |
tree | 7a88ce876403a932dd3fa5aa459e33ecdce6e851 /testsuites/libtests/dl03 | |
parent | libdl: Remove _t from all structures as this is reserved for the standards (diff) | |
download | rtems-696b9121a2b7ec80464d13c723e6c780a3e5608c.tar.bz2 |
libdl: Fix the tests loading the correct files
Diffstat (limited to 'testsuites/libtests/dl03')
-rw-r--r-- | testsuites/libtests/dl03/dl-cache.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/testsuites/libtests/dl03/dl-cache.c b/testsuites/libtests/dl03/dl-cache.c index 82227cbf85..53c4fe7401 100644 --- a/testsuites/libtests/dl03/dl-cache.c +++ b/testsuites/libtests/dl03/dl-cache.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Chris Johns <chrisj@rtems.org>. All rights reserved. + * Copyright (c) 2016, 2018 Chris Johns <chrisj@rtems.org>. All rights reserved. * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -63,7 +63,7 @@ static bool dl_cache_check(void* buffer, off_t offset, size_t length) return memcmp(buffer, contents + offset, length) == 0; } -static off_t dl_cache_buffer_offset(rtems_rtl_obj_cache_t* cache, void* buffer) +static off_t dl_cache_buffer_offset(rtems_rtl_obj_cache* cache, void* buffer) { return (off_t) (((uint8_t*) buffer) - ((uint8_t*) cache->buffer)); } @@ -73,22 +73,22 @@ static void dl_init_rtl(void) /* * Check the RTL object is created and can be locked and unlocked. */ - rtems_test_assert(rtems_rtl_data () == NULL); + rtems_test_assert(rtems_rtl_data_unprotected () == NULL); rtems_test_assert(rtems_rtl_lock () != NULL); rtems_rtl_unlock (); - rtems_test_assert(rtems_rtl_data () != NULL); + rtems_test_assert(rtems_rtl_data_unprotected () != NULL); rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL | RTEMS_RTL_TRACE_CACHE); } int dl_cache_test(void) { - rtems_rtl_obj_cache_t cache; - int fd; - void* buffer; - off_t offset_in; - off_t offset; - size_t length_in; - size_t length; + rtems_rtl_obj_cache cache; + int fd; + void* buffer; + off_t offset_in; + off_t offset; + size_t length_in; + size_t length; /* * Make sure the RTL can initialise. |