diff --git a/tests/subsys/llext/simple/CMakeLists.txt b/tests/subsys/llext/CMakeLists.txt similarity index 97% rename from tests/subsys/llext/simple/CMakeLists.txt rename to tests/subsys/llext/CMakeLists.txt index 0a0236ceeec8..de19cb0ac539 100644 --- a/tests/subsys/llext/simple/CMakeLists.txt +++ b/tests/subsys/llext/CMakeLists.txt @@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(llext_simple_test) +project(llext_test) target_sources(app PRIVATE - src/test_llext_simple.c + src/test_llext.c ) target_include_directories(app PRIVATE diff --git a/tests/subsys/llext/simple/boards/qemu_arc_qemu_arc_em.conf b/tests/subsys/llext/boards/qemu_arc_qemu_arc_em.conf similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_arc_qemu_arc_em.conf rename to tests/subsys/llext/boards/qemu_arc_qemu_arc_em.conf diff --git a/tests/subsys/llext/simple/boards/qemu_arc_qemu_arc_em.overlay b/tests/subsys/llext/boards/qemu_arc_qemu_arc_em.overlay similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_arc_qemu_arc_em.overlay rename to tests/subsys/llext/boards/qemu_arc_qemu_arc_em.overlay diff --git a/tests/subsys/llext/simple/boards/qemu_cortex_a9.conf b/tests/subsys/llext/boards/qemu_cortex_a9.conf similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_cortex_a9.conf rename to tests/subsys/llext/boards/qemu_cortex_a9.conf diff --git a/tests/subsys/llext/simple/boards/qemu_cortex_a9.overlay b/tests/subsys/llext/boards/qemu_cortex_a9.overlay similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_cortex_a9.overlay rename to tests/subsys/llext/boards/qemu_cortex_a9.overlay diff --git a/tests/subsys/llext/simple/boards/qemu_cortex_r5.conf b/tests/subsys/llext/boards/qemu_cortex_r5.conf similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_cortex_r5.conf rename to tests/subsys/llext/boards/qemu_cortex_r5.conf diff --git a/tests/subsys/llext/simple/boards/qemu_cortex_r5.overlay b/tests/subsys/llext/boards/qemu_cortex_r5.overlay similarity index 100% rename from tests/subsys/llext/simple/boards/qemu_cortex_r5.overlay rename to tests/subsys/llext/boards/qemu_cortex_r5.overlay diff --git a/tests/subsys/llext/simple/no_mem_protection.conf b/tests/subsys/llext/no_mem_protection.conf similarity index 100% rename from tests/subsys/llext/simple/no_mem_protection.conf rename to tests/subsys/llext/no_mem_protection.conf diff --git a/tests/subsys/llext/simple/prj.conf b/tests/subsys/llext/prj.conf similarity index 100% rename from tests/subsys/llext/simple/prj.conf rename to tests/subsys/llext/prj.conf diff --git a/tests/subsys/llext/simple/src/detached_fn_ext.c b/tests/subsys/llext/src/detached_fn_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/detached_fn_ext.c rename to tests/subsys/llext/src/detached_fn_ext.c diff --git a/tests/subsys/llext/simple/src/export_dependency_ext.c b/tests/subsys/llext/src/export_dependency_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/export_dependency_ext.c rename to tests/subsys/llext/src/export_dependency_ext.c diff --git a/tests/subsys/llext/simple/src/export_dependent_ext.c b/tests/subsys/llext/src/export_dependent_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/export_dependent_ext.c rename to tests/subsys/llext/src/export_dependent_ext.c diff --git a/tests/subsys/llext/simple/src/find_section_ext.c b/tests/subsys/llext/src/find_section_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/find_section_ext.c rename to tests/subsys/llext/src/find_section_ext.c diff --git a/tests/subsys/llext/simple/src/hello_world_ext.c b/tests/subsys/llext/src/hello_world_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/hello_world_ext.c rename to tests/subsys/llext/src/hello_world_ext.c diff --git a/tests/subsys/llext/simple/src/init_fini_ext.c b/tests/subsys/llext/src/init_fini_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/init_fini_ext.c rename to tests/subsys/llext/src/init_fini_ext.c diff --git a/tests/subsys/llext/simple/src/logging_ext.c b/tests/subsys/llext/src/logging_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/logging_ext.c rename to tests/subsys/llext/src/logging_ext.c diff --git a/tests/subsys/llext/simple/src/movwmovt_ext.c b/tests/subsys/llext/src/movwmovt_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/movwmovt_ext.c rename to tests/subsys/llext/src/movwmovt_ext.c diff --git a/tests/subsys/llext/simple/src/multi_file_ext1.c b/tests/subsys/llext/src/multi_file_ext1.c similarity index 100% rename from tests/subsys/llext/simple/src/multi_file_ext1.c rename to tests/subsys/llext/src/multi_file_ext1.c diff --git a/tests/subsys/llext/simple/src/multi_file_ext2.c b/tests/subsys/llext/src/multi_file_ext2.c similarity index 100% rename from tests/subsys/llext/simple/src/multi_file_ext2.c rename to tests/subsys/llext/src/multi_file_ext2.c diff --git a/tests/subsys/llext/simple/src/object_ext.c b/tests/subsys/llext/src/object_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/object_ext.c rename to tests/subsys/llext/src/object_ext.c diff --git a/tests/subsys/llext/simple/src/pre_located_ext.c b/tests/subsys/llext/src/pre_located_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/pre_located_ext.c rename to tests/subsys/llext/src/pre_located_ext.c diff --git a/tests/subsys/llext/simple/src/relative_jump_ext.c b/tests/subsys/llext/src/relative_jump_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/relative_jump_ext.c rename to tests/subsys/llext/src/relative_jump_ext.c diff --git a/tests/subsys/llext/simple/src/syscalls_ext.c b/tests/subsys/llext/src/syscalls_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/syscalls_ext.c rename to tests/subsys/llext/src/syscalls_ext.c diff --git a/tests/subsys/llext/simple/src/syscalls_ext.h b/tests/subsys/llext/src/syscalls_ext.h similarity index 100% rename from tests/subsys/llext/simple/src/syscalls_ext.h rename to tests/subsys/llext/src/syscalls_ext.h diff --git a/tests/subsys/llext/simple/src/test_llext_simple.c b/tests/subsys/llext/src/test_llext.c similarity index 99% rename from tests/subsys/llext/simple/src/test_llext_simple.c rename to tests/subsys/llext/src/test_llext.c index dac834922f0a..56f676c4e8f9 100644 --- a/tests/subsys/llext/simple/src/test_llext_simple.c +++ b/tests/subsys/llext/src/test_llext.c @@ -23,7 +23,7 @@ #include "threads_kernel_objects_ext.h" -LOG_MODULE_REGISTER(test_llext_simple); +LOG_MODULE_REGISTER(test_llext); #ifdef CONFIG_LLEXT_STORAGE_WRITABLE diff --git a/tests/subsys/llext/simple/src/threads_kernel_objects_ext.c b/tests/subsys/llext/src/threads_kernel_objects_ext.c similarity index 100% rename from tests/subsys/llext/simple/src/threads_kernel_objects_ext.c rename to tests/subsys/llext/src/threads_kernel_objects_ext.c diff --git a/tests/subsys/llext/simple/src/threads_kernel_objects_ext.h b/tests/subsys/llext/src/threads_kernel_objects_ext.h similarity index 100% rename from tests/subsys/llext/simple/src/threads_kernel_objects_ext.h rename to tests/subsys/llext/src/threads_kernel_objects_ext.h diff --git a/tests/subsys/llext/simple/testcase.yaml b/tests/subsys/llext/testcase.yaml similarity index 93% rename from tests/subsys/llext/simple/testcase.yaml rename to tests/subsys/llext/testcase.yaml index bd48a6374f93..2d97da954cf5 100644 --- a/tests/subsys/llext/simple/testcase.yaml +++ b/tests/subsys/llext/testcase.yaml @@ -24,14 +24,14 @@ tests: # without actually running it to load some extension, let's keep it in # good shape and ready to be used by additional architectures in the # future. - llext.simple.loader_build: + llext.loader_build: build_only: true # Run the suite with all combinations of core Kconfig options for the LLEXT # subsystem (storage type, ELF type, MPU/MMU etc). To focus on LLEXT issues, # most tests include no_mem_protection.conf, which disables memory protection # hardware completely. - llext.simple.readonly: + llext.readonly: arch_allow: # Xtensa needs writable storage - arm - riscv @@ -40,14 +40,14 @@ tests: extra_conf_files: ['no_mem_protection.conf'] extra_configs: - CONFIG_LLEXT_STORAGE_WRITABLE=n - llext.simple.readonly_mpu: + llext.readonly_mpu: min_ram: 128 arch_allow: arm # Xtensa needs writable storage, currently not supported on RISC-V filter: CONFIG_ARCH_HAS_USERSPACE extra_configs: - CONFIG_USERSPACE=y - CONFIG_LLEXT_STORAGE_WRITABLE=n - llext.simple.readonly_mmu: + llext.readonly_mmu: arch_allow: - arm64 - arm @@ -58,7 +58,7 @@ tests: extra_configs: - CONFIG_LLEXT_HEAP_SIZE=128 # qemu_cortex_a9 requires larger heap - CONFIG_LLEXT_STORAGE_WRITABLE=n - llext.simple.writable: + llext.writable: arch_allow: - arm - xtensa @@ -70,7 +70,7 @@ tests: extra_conf_files: ['no_mem_protection.conf'] extra_configs: - CONFIG_LLEXT_STORAGE_WRITABLE=y - llext.simple.writable_relocatable: + llext.writable_relocatable: arch_allow: - arm - xtensa @@ -91,7 +91,7 @@ tests: # Test the Symbol Link Identifier (SLID) linking feature on writable # storage to cover both ARM and Xtensa architectures on the same test. - llext.simple.writable_slid_linking: + llext.writable_slid_linking: arch_allow: - arm - xtensa @@ -104,7 +104,7 @@ tests: extra_configs: - CONFIG_LLEXT_STORAGE_WRITABLE=y - CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y - llext.simple.writable_relocatable_slid_linking: + llext.writable_relocatable_slid_linking: arch_allow: - arm - xtensa