diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-08-25 12:38:48 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-08-25 12:38:48 +0000 |
| commit | cfe3c083cce0cf75d1081048f7ce41141f056e81 (patch) | |
| tree | 1808938c6eccc6c72a64f7a0cd42a8d42218710f /testsuites | |
| parent | 2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-cfe3c083cce0cf75d1081048f7ce41141f056e81.tar.bz2 | |
2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
* malloctest/init.c: Update for heap API changes.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/libtests/ChangeLog | 4 | ||||
| -rw-r--r-- | testsuites/libtests/malloctest/init.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 9e8504858d..fba80aeeba 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,7 @@ +2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * malloctest/init.c: Update for heap API changes. + 2010-08-23 Sebastian Huber <sebastian.huber@embedded-brains.de> * gxx01/gxx_wrappers.h, gxx02/.cvsignore, gxx02/Makefile.am, diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c index 82a75fe5b5..73da21253e 100644 --- a/testsuites/libtests/malloctest/init.c +++ b/testsuites/libtests/malloctest/init.c @@ -235,7 +235,7 @@ static void test_check_alloc( _Heap_Is_aligned( block_size, page_size ) ); - rtems_test_assert( alloc_end <= block_end + HEAP_BLOCK_SIZE_OFFSET ); + rtems_test_assert( alloc_end <= block_end + HEAP_ALLOC_BONUS ); rtems_test_assert( alloc_area_begin > block_begin ); rtems_test_assert( alloc_area_offset < page_size ); @@ -772,7 +772,7 @@ static void test_heap_do_block_allocate( int variant, void *p2 ) puts( "\tallocate block full space"); alloc_begin = alloc_box_begin; - alloc_size = alloc_box_size + HEAP_BLOCK_SIZE_OFFSET + alloc_size = alloc_box_size + HEAP_ALLOC_BONUS - HEAP_BLOCK_HEADER_SIZE; test_block_alloc( variant, 1, alloc_begin, alloc_size ); @@ -783,7 +783,7 @@ static void test_heap_do_block_allocate( int variant, void *p2 ) puts( "\tallocate block at the end"); alloc_begin = alloc_box_end - TEST_DEFAULT_PAGE_SIZE; - alloc_size = TEST_DEFAULT_PAGE_SIZE + HEAP_BLOCK_SIZE_OFFSET + alloc_size = TEST_DEFAULT_PAGE_SIZE + HEAP_ALLOC_BONUS - HEAP_BLOCK_HEADER_SIZE; test_block_alloc( variant, 3, alloc_begin, alloc_size ); } |