Changeset ce217f96 in rtems

Timestamp:

Mar 9, 2011, 3:39:58 PM (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, master

Children:

b1e13f4

Parents:

9d5f600

Message:

2011-03-09 Sebastian Huber <sebastian.huber@…>

• malloctest/init.c: Improve coverage.
• malloctest/malloctest.scn: Update.

Location:

testsuites/libtests

Files:

• ChangeLog (modified) (1 diff)
• malloctest/init.c (modified) (1 diff)
• malloctest/malloctest.scn (modified) (1 diff)

testsuites/libtests/ChangeLog

@@ +1 @@
+2011-03-09      Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+        * malloctest/init.c: Improve coverage.
+        * malloctest/malloctest.scn: Update.
+
 2011-02-22      Ralf Corsépius <ralf.corsepius@rtems.org>
 

testsuites/libtests/malloctest/init.c

@@ -941 +941 @@
 {
   bool ret = false;
-
-  _Heap_Initialize( &TestHeap, TestHeapMemory + 768, 256, 0 );
+  Heap_Control *heap = &TestHeap;
+  uint8_t *area_begin = TestHeapMemory;
+
+  _Heap_Initialize( heap, area_begin + 768, 256, 0 );
 
   puts( "heap extend - link below" );
-  ret = _Protected_heap_Extend( &TestHeap, TestHeapMemory + 0, 256 );
+  ret = _Protected_heap_Extend( heap, area_begin + 0, 256 );
   test_heap_assert( ret, true );
 
   puts( "heap extend - merge below" );
-  ret = _Protected_heap_Extend( &TestHeap, TestHeapMemory + 512, 256 );
+  ret = _Protected_heap_Extend( heap, area_begin + 512, 256 );
   test_heap_assert( ret, true );
 
   puts( "heap extend - merge above" );
-  ret = _Protected_heap_Extend( &TestHeap, TestHeapMemory + 1024, 256 );
+  ret = _Protected_heap_Extend( heap, area_begin + 1024, 256 );
   test_heap_assert( ret, true );
 
   puts( "heap extend - link above" );
-  ret = _Protected_heap_Extend( &TestHeap, TestHeapMemory + 1536, 256 );
+  ret = _Protected_heap_Extend( heap, area_begin + 1536, 256 );
   test_heap_assert( ret, true );
 
   puts( "heap extend - area too small" );
-  ret = _Protected_heap_Extend( &TestHeap, TestHeapMemory + 2048, 0 );
+  ret = _Protected_heap_Extend( heap, area_begin + 2048, 0 );
   test_heap_assert( ret, false );
 
   puts( "heap extend - invalid area" );
-  ret = _Protected_heap_Extend( &TestHeap, (void *) -1, 2 );
+  ret = _Protected_heap_Extend( heap, (void *) -1, 2 );
   test_heap_assert( ret, false );
+
+  area_begin = (uint8_t *) (((uintptr_t) area_begin) | 1);
+
+  _Heap_Initialize( heap, area_begin + 768, 256, 0 );
+
+  puts( "heap extend - merge below with align up" );
+  ret = _Protected_heap_Extend( heap, area_begin + 512, 256 );
+  test_heap_assert( ret, true );
 }
 

testsuites/libtests/malloctest/malloctest.scn

@@ -45 +45 @@
 malloc_walk - in critical section path
 Heap Initialized
-heap extend - bad address
-heap extend - OK
+heap extend - link below
+heap extend - merge below
+heap extend - merge above
+heap extend - link above
+heap extend - area too small
+heap extend - invalid area
+heap extend - merge below with align up
 malloc_free_space - check malloc space drops after malloc
 malloc_free_space - verify free space returns to previous value