diff --git a/tests/arch/arm/arm_irq_advanced_features/prj.conf b/tests/arch/arm/arm_irq_advanced_features/prj.conf index c5c24cf5873..ff88b08e88b 100644 --- a/tests/arch/arm/arm_irq_advanced_features/prj.conf +++ b/tests/arch/arm/arm_irq_advanced_features/prj.conf @@ -2,3 +2,4 @@ CONFIG_ZTEST=y CONFIG_DYNAMIC_INTERRUPTS=y CONFIG_DYNAMIC_DIRECT_INTERRUPTS=y CONFIG_ZERO_LATENCY_IRQS=y +CONFIG_ZTEST_NEW_API=y diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c index cacfc92e86b..0d6835bcfea 100644 --- a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c @@ -27,7 +27,7 @@ void arm_direct_isr_handler_1(const void *args) test_flag = 2; } -void test_arm_dynamic_direct_interrupts(void) +ZTEST(arm_irq_advanced_features, test_arm_dynamic_direct_interrupts) { int post_flag = 0; diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c index 9468a6dc545..782fdebd43f 100644 --- a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c @@ -15,7 +15,7 @@ extern irq_target_state_t irq_target_state_set(unsigned int irq, irq_target_state_t target_state); extern int irq_target_state_is_secure(unsigned int irq); -void test_arm_irq_target_state(void) +ZTEST(arm_irq_advanced_features, test_arm_irq_target_state) { /* Determine an NVIC IRQ line that is implemented * but not currently in use. @@ -77,9 +77,19 @@ void test_arm_irq_target_state(void) "Target state not set to Secure\n"); zassert_equal(irq_target_state_is_secure(i), 0, "Target state not set to Non-Secure\n"); + + result_state = + irq_target_state_set(i, IRQ_TARGET_STATE_SECURE); + + zassert_equal(result_state, IRQ_TARGET_STATE_SECURE, + "Target state not set to Secure\n"); + + zassert_equal(irq_target_state_is_secure(i), 1, + "Target state not set to Secure\n"); + } #else -void test_arm_irq_target_state(void) +ZTEST(arm_irq_advanced_features, test_arm_irq_target_state) { TC_PRINT("Skipped (TrustZone-M-enabled Cortex-M Mainline only)\n"); } diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c index 2b3fc7936be..893d6db4d36 100644 --- a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c @@ -17,7 +17,7 @@ void arm_zero_latency_isr_handler(const void *args) test_flag = 1; } -void test_arm_zero_latency_irqs(void) +ZTEST(arm_irq_advanced_features, test_arm_zero_latency_irqs) { if (!IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS)) { diff --git a/tests/arch/arm/arm_irq_advanced_features/src/main.c b/tests/arch/arm/arm_irq_advanced_features/src/main.c index a3e71128f11..5b76f072fa5 100644 --- a/tests/arch/arm/arm_irq_advanced_features/src/main.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/main.c @@ -6,15 +6,4 @@ #include -extern void test_arm_zero_latency_irqs(void); -extern void test_arm_dynamic_direct_interrupts(void); -extern void test_arm_irq_target_state(void); - -void test_main(void) -{ - ztest_test_suite(arm_irq_advanced_features, - ztest_unit_test(test_arm_dynamic_direct_interrupts), - ztest_unit_test(test_arm_zero_latency_irqs), - ztest_unit_test(test_arm_irq_target_state)); - ztest_run_test_suite(arm_irq_advanced_features); -} +ZTEST_SUITE(arm_irq_advanced_features, NULL, NULL, NULL, NULL, NULL);