From a24082d1be52383996bfcf3b1a00bb5297aa83b6 Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Wed, 18 Dec 2019 16:08:03 +0100 Subject: [PATCH] tests: arch: arm: move ZLI test to arm_irq_advanced_features suite Move the zero-latency IRQ test into the new arm_irq_advanced_features' test suite. Skip running the test for non Mainline Cortex-M. Signed-off-by: Ioannis Glaropoulos --- .../CMakeLists.txt | 0 .../README.txt | 0 .../prj.conf | 0 .../src/arm_zero_latency_irqs.c | 8 ++++++++ .../src/main.c | 4 ---- tests/arch/arm/arm_irq_advanced_features/testcase.yaml | 5 +++++ tests/arch/arm/arm_zero_latency_irqs/testcase.yaml | 5 ----- 7 files changed, 13 insertions(+), 9 deletions(-) rename tests/arch/arm/{arm_zero_latency_irqs => arm_irq_advanced_features}/CMakeLists.txt (100%) rename tests/arch/arm/{arm_zero_latency_irqs => arm_irq_advanced_features}/README.txt (100%) rename tests/arch/arm/{arm_zero_latency_irqs => arm_irq_advanced_features}/prj.conf (100%) rename tests/arch/arm/{arm_zero_latency_irqs => arm_irq_advanced_features}/src/arm_zero_latency_irqs.c (91%) rename tests/arch/arm/{arm_zero_latency_irqs => arm_irq_advanced_features}/src/main.c (74%) create mode 100644 tests/arch/arm/arm_irq_advanced_features/testcase.yaml delete mode 100644 tests/arch/arm/arm_zero_latency_irqs/testcase.yaml diff --git a/tests/arch/arm/arm_zero_latency_irqs/CMakeLists.txt b/tests/arch/arm/arm_irq_advanced_features/CMakeLists.txt similarity index 100% rename from tests/arch/arm/arm_zero_latency_irqs/CMakeLists.txt rename to tests/arch/arm/arm_irq_advanced_features/CMakeLists.txt diff --git a/tests/arch/arm/arm_zero_latency_irqs/README.txt b/tests/arch/arm/arm_irq_advanced_features/README.txt similarity index 100% rename from tests/arch/arm/arm_zero_latency_irqs/README.txt rename to tests/arch/arm/arm_irq_advanced_features/README.txt diff --git a/tests/arch/arm/arm_zero_latency_irqs/prj.conf b/tests/arch/arm/arm_irq_advanced_features/prj.conf similarity index 100% rename from tests/arch/arm/arm_zero_latency_irqs/prj.conf rename to tests/arch/arm/arm_irq_advanced_features/prj.conf diff --git a/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c similarity index 91% rename from tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c rename to tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c index 1463b385199..1232267b19d 100644 --- a/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c @@ -8,6 +8,8 @@ #include #include +#if defined(CONFIG_ZERO_LATENCY_IRQS) + static volatile int test_flag; void arm_zero_latency_isr_handler(void *args) @@ -83,6 +85,12 @@ void test_arm_zero_latency_irqs(void) irq_unlock(key); } +#else +void test_arm_zero_latency_irqs(void) +{ + TC_PRINT("Skipped (Cortex-M Mainline only)\n"); +} +#endif /* CONFIG_ZERO_LATENCY_IRQS */ /** * @} */ diff --git a/tests/arch/arm/arm_zero_latency_irqs/src/main.c b/tests/arch/arm/arm_irq_advanced_features/src/main.c similarity index 74% rename from tests/arch/arm/arm_zero_latency_irqs/src/main.c rename to tests/arch/arm/arm_irq_advanced_features/src/main.c index ed49a7d3635..05b2a7046de 100644 --- a/tests/arch/arm/arm_zero_latency_irqs/src/main.c +++ b/tests/arch/arm/arm_irq_advanced_features/src/main.c @@ -4,10 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if !defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE) - #error test can only run on Cortex-M3/M4/M7/M33 MCUs -#endif - #include extern void test_arm_zero_latency_irqs(void); diff --git a/tests/arch/arm/arm_irq_advanced_features/testcase.yaml b/tests/arch/arm/arm_irq_advanced_features/testcase.yaml new file mode 100644 index 00000000000..ab3c297653f --- /dev/null +++ b/tests/arch/arm/arm_irq_advanced_features/testcase.yaml @@ -0,0 +1,5 @@ +tests: + arch.arm.irq_advanced_features: + filter: CONFIG_ARMV6_M_ARMV8_M_BASELINE or CONFIG_ARMV7_M_ARMV8_M_MAINLINE + tags: arm interrupt + arch_whitelist: arm diff --git a/tests/arch/arm/arm_zero_latency_irqs/testcase.yaml b/tests/arch/arm/arm_zero_latency_irqs/testcase.yaml deleted file mode 100644 index 5115ec1b343..00000000000 --- a/tests/arch/arm/arm_zero_latency_irqs/testcase.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tests: - arch.arm.zero_latency_interrupts: - filter: CONFIG_ARMV7_M_ARMV8_M_MAINLINE - tags: arm interrupt - arch_whitelist: arm