From bfd59b17a1913ee00cbe447b59cdfd514eeeb693 Mon Sep 17 00:00:00 2001 From: Shaoan Li Date: Fri, 8 Jul 2022 09:34:09 +0800 Subject: [PATCH] tests: arch: arm: move test arm_thread_swap to new ztest API Migrate the testsuite tests/arch/arm/arm_thread_swap to the new ztest API. Signed-off-by: Shaoan Li --- tests/arch/arm/arm_thread_swap/prj.conf | 1 + tests/arch/arm/arm_thread_swap/src/arm_syscalls.c | 9 ++++----- .../arch/arm/arm_thread_swap/src/arm_thread_arch.c | 2 +- tests/arch/arm/arm_thread_swap/src/main.c | 13 +------------ 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/arch/arm/arm_thread_swap/prj.conf b/tests/arch/arm/arm_thread_swap/prj.conf index df696389344..a618b61b5ad 100644 --- a/tests/arch/arm/arm_thread_swap/prj.conf +++ b/tests/arch/arm/arm_thread_swap/prj.conf @@ -1,5 +1,6 @@ CONFIG_ZTEST=y CONFIG_DYNAMIC_INTERRUPTS=y +CONFIG_ZTEST_NEW_API=y CONFIG_TEST_USERSPACE=y CONFIG_APPLICATION_DEFINED_SYSCALL=y CONFIG_MAIN_STACK_SIZE=1024 diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c index bb983c76938..826cd015495 100644 --- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c +++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c @@ -150,7 +150,7 @@ static void user_thread_entry(uint32_t irq_line) #endif } -void test_arm_syscalls(void) +ZTEST(arm_thread_swap, test_arm_syscalls) { int i = 0; @@ -163,7 +163,6 @@ void test_arm_syscalls(void) * - PSPLIM register guards the default stack * - MSPLIM register guards the interrupt stack */ - zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0, "mode variable not set to PRIV mode for supervisor thread\n"); @@ -279,7 +278,7 @@ static inline void z_vrfy_test_arm_cpu_write_reg(void) * * @ingroup kernel_memprotect_tests */ -void test_syscall_cpu_scrubs_regs(void) +ZTEST_USER(arm_thread_swap, test_syscall_cpu_scrubs_regs) { uint32_t arm_reg_val[4]; @@ -297,12 +296,12 @@ void test_syscall_cpu_scrubs_regs(void) } } #else -void test_syscall_cpu_scrubs_regs(void) +ZTEST_USER(arm_thread_swap, test_syscall_cpu_scrubs_regs) { ztest_test_skip(); } -void test_arm_syscalls(void) +ZTEST(arm_thread_swap, test_arm_syscalls) { ztest_test_skip(); } diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c index a5cfc679e1a..eab49fa0c28 100644 --- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c +++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c @@ -403,7 +403,7 @@ static void alt_thread_entry(void) "Alternative thread: switch flag not false on thread exit\n"); } -void test_arm_thread_swap(void) +ZTEST(arm_thread_swap, test_arm_thread_swap) { int test_flag; diff --git a/tests/arch/arm/arm_thread_swap/src/main.c b/tests/arch/arm/arm_thread_swap/src/main.c index 862c5521436..b5b78ae98a1 100644 --- a/tests/arch/arm/arm_thread_swap/src/main.c +++ b/tests/arch/arm/arm_thread_swap/src/main.c @@ -6,15 +6,4 @@ #include -extern void test_arm_thread_swap(void); -extern void test_arm_syscalls(void); -extern void test_syscall_cpu_scrubs_regs(void); - -void test_main(void) -{ - ztest_test_suite(arm_thread_swap, - ztest_unit_test(test_arm_thread_swap), - ztest_unit_test(test_arm_syscalls), - ztest_user_unit_test(test_syscall_cpu_scrubs_regs)); - ztest_run_test_suite(arm_thread_swap); -} +ZTEST_SUITE(arm_thread_swap, NULL, NULL, NULL, NULL, NULL);