From 3625f20598f4c29465d1c01ab1af7617e01a0fcb Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Fri, 15 Nov 2024 12:31:38 -0800 Subject: [PATCH 1/2] tests: thread_error_case: fix incorrect userspace filtering The filter here should be used to filter for capability: whether the platform configuration supports userspace. And if it does support userspace, we then enable CONFIG_TEST_USERSPACE (and thus CONFIG_USERSPACE) for testing. We should not be filtering for whether userspace is enabled, but should really be filtering for whether userspace is supported. Signed-off-by: Daniel Leung --- tests/kernel/threads/thread_error_case/testcase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/kernel/threads/thread_error_case/testcase.yaml b/tests/kernel/threads/thread_error_case/testcase.yaml index 69106b0f61171..171bc8b3b6eab 100644 --- a/tests/kernel/threads/thread_error_case/testcase.yaml +++ b/tests/kernel/threads/thread_error_case/testcase.yaml @@ -4,7 +4,7 @@ tests: - kernel - threads - userspace - filter: CONFIG_USERSPACE + filter: CONFIG_ARCH_HAS_USERSPACE ignore_faults: true integration_platforms: - qemu_x86 From dcb16d85815d6f1a5e52506efb2df80f9279f248 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Fri, 15 Nov 2024 12:41:36 -0800 Subject: [PATCH 2/2] tests: ztest/base: fix incorrect userspace filtering The filter here should be used to filter for capability: whether the platform configuration supports userspace. And if it does support userspace, we then enable CONFIG_TEST_USERSPACE (and thus CONFIG_USERSPACE) for testing. We should not be filtering for whether userspace is enabled, but should really be filtering for whether userspace is supported. Signed-off-by: Daniel Leung --- tests/ztest/base/testcase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ztest/base/testcase.yaml b/tests/ztest/base/testcase.yaml index 2b6107cd20482..eb88b48786f02 100644 --- a/tests/ztest/base/testcase.yaml +++ b/tests/ztest/base/testcase.yaml @@ -16,7 +16,7 @@ tests: integration_platforms: - native_sim testing.ztest.base.verbose_0_userspace: - filter: CONFIG_USERSPACE + filter: CONFIG_ARCH_HAS_USERSPACE extra_args: CONF_FILE=prj_verbose_0.conf tags: - userspace