From 594d8aa9c7a3a915730f7ba5e1ce5992de680fbe Mon Sep 17 00:00:00 2001 From: Luca Burelli Date: Tue, 11 Jun 2024 10:04:52 +0200 Subject: [PATCH] llext: remove the "modules_enabled" tests These tests are simple copies of the existing tests with the addition of the CONFIG_MODULES=y option. This different Kconfig setting has no practical effect on the code, and the tests are therefore redundant. Remove them to halve the number of tests. Signed-off-by: Luca Burelli --- tests/subsys/llext/simple/Kconfig | 12 ---- tests/subsys/llext/simple/testcase.yaml | 85 ++----------------------- 2 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 tests/subsys/llext/simple/Kconfig diff --git a/tests/subsys/llext/simple/Kconfig b/tests/subsys/llext/simple/Kconfig deleted file mode 100644 index 047e1a4502603d8..000000000000000 --- a/tests/subsys/llext/simple/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2024 Intel Corporation. - -mainmenu "LLEXT functionality test" - -source "Kconfig.zephyr" - -config LLEXT_TEST_HELLO - tristate "llext hello test" - default y - help - This enables building the hello_world test case. diff --git a/tests/subsys/llext/simple/testcase.yaml b/tests/subsys/llext/simple/testcase.yaml index 8a3aca97037d7b9..069d7e6f7feffc2 100644 --- a/tests/subsys/llext/simple/testcase.yaml +++ b/tests/subsys/llext/simple/testcase.yaml @@ -4,9 +4,9 @@ common: - arm - xtensa platform_exclude: - - apollo4p_evb - - apollo4p_blue_kxr_evb - - numaker_pfm_m487 # See #63167 + - apollo4p_evb # See #73443 + - apollo4p_blue_kxr_evb # See #73443 + - numaker_pfm_m487 # See #63167 tests: # While there is in practice no value in compiling subsys/llext/*.c @@ -36,50 +36,14 @@ tests: extra_configs: - arch:arm:CONFIG_ARM_MPU=n - CONFIG_LLEXT_STORAGE_WRITABLE=y - llext.simple.modules_enabled_writable: - filter: not CONFIG_MPU and not CONFIG_MMU - platform_key: - - simulation - - arch - platform_exclude: - - qemu_cortex_a9 # MMU - extra_configs: - - arch:arm:CONFIG_ARM_MPU=n - - CONFIG_MODULES=y - - CONFIG_LLEXT_STORAGE_WRITABLE=y - - CONFIG_LLEXT_TEST_HELLO=m - llext.simple.modules_enabled_writable_relocatable: + llext.simple.writable_relocatable: arch_exclude: arm arm64 filter: not CONFIG_MPU and not CONFIG_MMU integration_platforms: - qemu_xtensa extra_configs: - - CONFIG_MODULES=y - CONFIG_LLEXT_STORAGE_WRITABLE=y - CONFIG_LLEXT_TYPE_ELF_RELOCATABLE=y - - CONFIG_LLEXT_TEST_HELLO=m - llext.simple.modules_enabled_readonly: - filter: not CONFIG_MPU and not CONFIG_MMU - arch_exclude: xtensa # for now - platform_key: - - simulation - - arch - platform_exclude: - - qemu_cortex_a9 # MMU - extra_configs: - - arch:arm:CONFIG_ARM_MPU=n - - CONFIG_MODULES=y - - CONFIG_LLEXT_TEST_HELLO=m - llext.simple.modules_enabled_readonly_mpu: - filter: CONFIG_ARCH_HAS_USERSPACE - arch_exclude: xtensa # for now - platform_key: - - simulation - - arch - extra_configs: - - CONFIG_USERSPACE=y - - CONFIG_MODULES=y - - CONFIG_LLEXT_TEST_HELLO=m llext.simple.readonly_slid_linking: arch_exclude: xtensa # for now filter: not CONFIG_MPU and not CONFIG_MMU and not CONFIG_SOC_SERIES_S32ZE @@ -100,51 +64,12 @@ tests: extra_configs: - arch:arm:CONFIG_ARM_MPU=n - CONFIG_LLEXT_STORAGE_WRITABLE=y - llext.simple.modules_enabled_writable_slid_linking: - filter: not CONFIG_MPU and not CONFIG_MMU - platform_key: - - simulation - - arch - platform_exclude: - - qemu_cortex_a9 # MMU - extra_configs: - - arch:arm:CONFIG_ARM_MPU=n - - CONFIG_MODULES=y - - CONFIG_LLEXT_STORAGE_WRITABLE=y - - CONFIG_LLEXT_TEST_HELLO=m - - CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y - llext.simple.modules_enabled_writable_relocatable_slid_linking: + llext.simple.writable_relocatable_slid_linking: arch_exclude: arm arm64 filter: not CONFIG_MPU and not CONFIG_MMU integration_platforms: - qemu_xtensa extra_configs: - - CONFIG_MODULES=y - CONFIG_LLEXT_STORAGE_WRITABLE=y - CONFIG_LLEXT_TYPE_ELF_RELOCATABLE=y - - CONFIG_LLEXT_TEST_HELLO=m - - CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y - llext.simple.modules_enabled_readonly_slid_linking: - filter: not CONFIG_MPU and not CONFIG_MMU - arch_exclude: xtensa # for now - platform_key: - - simulation - - arch - platform_exclude: - - qemu_cortex_a9 # MMU - extra_configs: - - arch:arm:CONFIG_ARM_MPU=n - - CONFIG_MODULES=y - - CONFIG_LLEXT_TEST_HELLO=m - - CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y - llext.simple.modules_enabled_readonly_mpu_slid_linking: - filter: CONFIG_ARCH_HAS_USERSPACE - arch_exclude: xtensa # for now - platform_key: - - simulation - - arch - extra_configs: - - CONFIG_USERSPACE=y - - CONFIG_MODULES=y - - CONFIG_LLEXT_TEST_HELLO=m - CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y