michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests,samples: Fix picolibc malloc arena settings

Browse source 
With picolibc moving to using the common malloc implementation, samples and
tests with picolibc-specific settings need to switch to using the common
malloc settings instead.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2023-05-01 10:43:58 -07:00 • committed by Stephanos Ioannidis
commit bfa6a44746
9 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/basic/hash_map/prj.conf
View file

@ -8,7 +8,6 @@ CONFIG_LOG=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192 CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
CONFIG_PICOLIBC_HEAP_SIZE=8192
CONFIG_SYS_HASH_FUNC32=y CONFIG_SYS_HASH_FUNC32=y
CONFIG_SYS_HASH_MAP=y CONFIG_SYS_HASH_MAP=y

2
tests/arch/arm/arm_ramfunc/testcase.yaml
View file

@ -4,4 +4,4 @@ tests:
tags: arm userspace tags: arm userspace
arch_allow: arm arch_allow: arm
extra_configs: extra_configs:
- CONFIG_PICOLIBC_HEAP_SIZE=0 - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0

2
tests/crypto/mbedtls/testcase.yaml
View file

@ -7,5 +7,5 @@ tests:
crypto.mbedtls: crypto.mbedtls:
platform_exclude: m2gl025_miv platform_exclude: m2gl025_miv
extra_configs: extra_configs:
- CONFIG_PICOLIBC_HEAP_SIZE=0 - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
- arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192 - arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192

4
tests/kernel/mem_protect/demand_paging/testcase.yaml
View file

@ -5,11 +5,11 @@ tests:
tags: kernel mmu demand_paging tags: kernel mmu demand_paging
filter: CONFIG_DEMAND_PAGING filter: CONFIG_DEMAND_PAGING
extra_configs: extra_configs:
- CONFIG_PICOLIBC_HEAP_SIZE=0 - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
kernel.demand_paging.timing_funcs: kernel.demand_paging.timing_funcs:
tags: kernel mmu demand_paging tags: kernel mmu demand_paging
platform_allow: qemu_x86_tiny platform_allow: qemu_x86_tiny
filter: CONFIG_DEMAND_PAGING filter: CONFIG_DEMAND_PAGING
extra_configs: extra_configs:
- CONFIG_DEMAND_PAGING_STATS_USING_TIMING_FUNCTIONS=y - CONFIG_DEMAND_PAGING_STATS_USING_TIMING_FUNCTIONS=y
- CONFIG_PICOLIBC_HEAP_SIZE=0 - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0

2
tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53.conf
View file

@ -5,4 +5,4 @@
# for the mapping exhaustion test. # for the mapping exhaustion test.
CONFIG_MAX_XLAT_TABLES=32 CONFIG_MAX_XLAT_TABLES=32
CONFIG_MAX_DOMAIN_PARTITIONS=24 CONFIG_MAX_DOMAIN_PARTITIONS=24
CONFIG_PICOLIBC_HEAP_SIZE=0 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0

2
tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53_smp.conf
View file

@ -5,4 +5,4 @@
# for the mapping exhaustion test. # for the mapping exhaustion test.
CONFIG_MAX_XLAT_TABLES=32 CONFIG_MAX_XLAT_TABLES=32
CONFIG_MAX_DOMAIN_PARTITIONS=24 CONFIG_MAX_DOMAIN_PARTITIONS=24
CONFIG_PICOLIBC_HEAP_SIZE=0 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0

2
tests/kernel/mem_protect/mem_map/testcase.yaml
View file

@ -5,7 +5,7 @@ tests:
kernel.memory_protection.mem_map: kernel.memory_protection.mem_map:
filter: CONFIG_MMU and not CONFIG_X86_64 filter: CONFIG_MMU and not CONFIG_X86_64
extra_sections: _TRANSPLANTED_FUNC extra_sections: _TRANSPLANTED_FUNC
extra_args: CONFIG_PICOLIBC_HEAP_SIZE=0 extra_args: CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
platform_exclude: qemu_x86_64 platform_exclude: qemu_x86_64
kernel.memory_protection.mem_map.x86_64: kernel.memory_protection.mem_map.x86_64:
filter: CONFIG_MMU and CONFIG_X86_64 and not CONFIG_COVERAGE filter: CONFIG_MMU and CONFIG_X86_64 and not CONFIG_COVERAGE

2
tests/kernel/mem_protect/userspace/testcase.yaml
View file

@ -6,7 +6,7 @@ tests:
filter: CONFIG_ARCH_HAS_USERSPACE filter: CONFIG_ARCH_HAS_USERSPACE
extra_configs: extra_configs:
- CONFIG_TEST_HW_STACK_PROTECTION=n - CONFIG_TEST_HW_STACK_PROTECTION=n
- CONFIG_PICOLIBC_HEAP_SIZE=0 - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
kernel.memory_protection.userspace.gap_filling.arc: kernel.memory_protection.userspace.gap_filling.arc:
filter: CONFIG_ARCH_HAS_USERSPACE and CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS filter: CONFIG_ARCH_HAS_USERSPACE and CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS
arch_allow: arc arch_allow: arc

1
tests/lib/hash_map/prj.conf
View file

@ -7,7 +7,6 @@ CONFIG_ZTEST_NEW_API=y
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192 CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
CONFIG_PICOLIBC_HEAP_SIZE=8192
CONFIG_SYS_HASH_FUNC32=y CONFIG_SYS_HASH_FUNC32=y
CONFIG_SYS_HASH_MAP=y CONFIG_SYS_HASH_MAP=y