smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Use TOTAL_MALLOC_LEN for abuf and alist tests

Browse Source 
Several tests use CONFIG_SYS_MALLOC_LEN to test allocations that should
fail due to exceeding pool size. However, the actual malloc pool size is
TOTAL_MALLOC_LEN, which includes CONFIG_ENV_SIZE for boards that need to
store the environment in RAM. The extra space accommodates:

- the hash table allocated via calloc()
- strdup() calls for each environment variable key
- strdup() calls for each environment variable value

This is an estimate and typically consumes less than CONFIG_ENV_SIZE,
leaving more free space in the malloc pool than was reserved.

On qemu-x86_64, CONFIG_ENV_SIZE is 0x40000, making the actual pool
0x240000 bytes. Tests expecting malloc(CONFIG_SYS_MALLOC_LEN) to fail
might unexpectedly succeed since there's more space available.

Update all tests to use TOTAL_MALLOC_LEN to correctly reflect the actual
malloc pool size.

Co-developed-by: Claude <noreply@anthropic.com>
This commit is contained in:
Simon Glass
2025-12-01 00:08:00 +00:00
parent 8503a36c18
commit 654efb5edd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/lib/abuf.c
View File

@@ -5,6 +5,7 @@
*/
#include <abuf.h>
#include <env_internal.h>
#include <mapmem.h>
#include <test/lib.h>
#include <test/test.h>
@@ -244,7 +245,7 @@ static int lib_test_abuf_large(struct unit_test_state *uts)
/* Try an impossible size */
abuf_init(&buf);
ut_asserteq(false, abuf_realloc(&buf, CONFIG_SYS_MALLOC_LEN));
ut_asserteq(false, abuf_realloc(&buf, TOTAL_MALLOC_LEN));
ut_assertnull(buf.data);
ut_asserteq(0, buf.size);
ut_asserteq(false, buf.alloced);
@@ -264,7 +265,7 @@ static int lib_test_abuf_large(struct unit_test_state *uts)
ut_assert(delta > 0);
/* try to increase it */
ut_asserteq(false, abuf_realloc(&buf, CONFIG_SYS_MALLOC_LEN));
ut_asserteq(false, abuf_realloc(&buf, TOTAL_MALLOC_LEN));
ut_asserteq_ptr(ptr, buf.data);
ut_asserteq(TEST_DATA_LEN, buf.size);
ut_asserteq(true, buf.alloced);

3
test/lib/alist.c
View File

@@ -5,6 +5,7 @@
*/
#include <alist.h>
#include <env_internal.h>
#include <string.h>
#include <test/lib.h>
#include <test/test.h>
@@ -41,7 +42,7 @@ static int lib_test_alist_init(struct unit_test_state *uts)
/* use an impossible size */
ut_asserteq(false, alist_init(&lst, obj_size,
CONFIG_SYS_MALLOC_LEN));
TOTAL_MALLOC_LEN));
ut_assertnull(lst.data);
ut_asserteq(0, lst.count);
ut_asserteq(0, lst.alloc);