From c882843af2d4dcfdea175d141183446e3d6c245f Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 26 Apr 2022 18:07:26 -0400 Subject: [PATCH] Revert "ztest: add userspace tests to base tests" This reverts commit 395bbb5122c412a5e9a64ef2aee6cfc73975fa6e. Signed-off-by: Anas Nashif --- tests/ztest/base/CMakeLists.txt | 2 -- tests/ztest/base/src/main_userspace.c | 13 ------------- tests/ztest/base/testcase.yaml | 8 -------- 3 files changed, 23 deletions(-) delete mode 100644 tests/ztest/base/src/main_userspace.c diff --git a/tests/ztest/base/CMakeLists.txt b/tests/ztest/base/CMakeLists.txt index 28ff02e543c..e6da41a3086 100644 --- a/tests/ztest/base/CMakeLists.txt +++ b/tests/ztest/base/CMakeLists.txt @@ -11,6 +11,4 @@ else() project(base) target_sources(app PRIVATE src/main.c) - - target_sources_ifdef(CONFIG_USERSPACE app PRIVATE src/main_userspace.c) endif() diff --git a/tests/ztest/base/src/main_userspace.c b/tests/ztest/base/src/main_userspace.c deleted file mode 100644 index cc8d81e304b..00000000000 --- a/tests/ztest/base/src/main_userspace.c +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2022 Google Inc - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -ZTEST_USER(framework_tests, test_userspace_is_user) -{ - zassert_true(k_is_user_context(), NULL); -} diff --git a/tests/ztest/base/testcase.yaml b/tests/ztest/base/testcase.yaml index 984b0d826e0..41c04a3e512 100644 --- a/tests/ztest/base/testcase.yaml +++ b/tests/ztest/base/testcase.yaml @@ -7,14 +7,6 @@ tests: tags: test_framework integration_platforms: - native_posix - testing.ztest.base.verbose_0_userspace: - filter: CONFIG_ARCH_HAS_USERSPACE - extra_args: CONF_FILE=prj_verbose_0.conf - tags: test_framework userspace - extra_configs: - - CONFIG_TEST_USERSPACE=y - integration_platforms: - - native_posix testing.ztest.base.verbose_1: extra_args: CONF_FILE=prj_verbose_1.conf tags: test_framework