From fa98745a1000bc208e7c17ecffc49a9580111b94 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 1 Jun 2023 07:35:21 -0400 Subject: [PATCH] tests: remove linker_generator sub tests from kernel Kernel is being built the same way for all those tests and there is not much related to the linker generator in any of those tests. Just keep a small set of tests to have needed coverage in the kernel. Signed-off-by: Anas Nashif --- tests/kernel/early_sleep/testcase.yaml | 5 ----- tests/kernel/events/event_api/testcase.yaml | 5 ----- tests/kernel/fifo/fifo_api/testcase.yaml | 11 ++++------- tests/kernel/fifo/fifo_timeout/testcase.yaml | 5 ----- tests/kernel/fifo/fifo_usage/testcase.yaml | 5 ----- tests/kernel/gen_isr_table/testcase.yaml | 3 ++- tests/kernel/interrupt/testcase.yaml | 8 -------- tests/kernel/lifo/lifo_api/testcase.yaml | 5 ----- tests/kernel/lifo/lifo_usage/testcase.yaml | 5 ----- tests/kernel/mbox/mbox_api/testcase.yaml | 5 ----- tests/kernel/mbox/mbox_usage/testcase.yaml | 5 ----- tests/kernel/mem_heap/k_heap_api/testcase.yaml | 9 +-------- tests/kernel/mem_heap/mheap_api_concept/testcase.yaml | 6 ------ tests/kernel/mem_slab/mslab/testcase.yaml | 5 ----- tests/kernel/mem_slab/mslab_api/testcase.yaml | 5 ----- tests/kernel/mem_slab/mslab_concept/testcase.yaml | 5 ----- tests/kernel/mem_slab/mslab_threadsafe/testcase.yaml | 5 ----- tests/kernel/mp/testcase.yaml | 6 ------ tests/kernel/msgq/msgq_usage/testcase.yaml | 5 ----- tests/kernel/sched/deadline/testcase.yaml | 5 ----- tests/kernel/sched/metairq/testcase.yaml | 5 ----- tests/kernel/sched/preempt/testcase.yaml | 6 ------ tests/kernel/sched/schedule_api/testcase.yaml | 7 ------- tests/kernel/smp/testcase.yaml | 7 ------- tests/kernel/timer/timer_monotonic/testcase.yaml | 5 ----- tests/kernel/workq/critical/testcase.yaml | 6 ------ tests/kernel/workq/work/testcase.yaml | 5 ----- tests/kernel/workq/work_queue/testcase.yaml | 9 +++------ tests/kernel/xip/testcase.yaml | 5 ----- 29 files changed, 10 insertions(+), 158 deletions(-) diff --git a/tests/kernel/early_sleep/testcase.yaml b/tests/kernel/early_sleep/testcase.yaml index d0e226443b8..4f7bf7e1673 100644 --- a/tests/kernel/early_sleep/testcase.yaml +++ b/tests/kernel/early_sleep/testcase.yaml @@ -3,8 +3,3 @@ tests: tags: - kernel - sleep - kernel.common.sleep.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/events/event_api/testcase.yaml b/tests/kernel/events/event_api/testcase.yaml index 0430beb9f8f..048c6adc7c4 100644 --- a/tests/kernel/events/event_api/testcase.yaml +++ b/tests/kernel/events/event_api/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.events: tags: kernel - kernel.events.linker_generator: - platform_allow: qemu_x86 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/fifo/fifo_api/testcase.yaml b/tests/kernel/fifo/fifo_api/testcase.yaml index f017ebf8e64..8c5abbf6d20 100644 --- a/tests/kernel/fifo/fifo_api/testcase.yaml +++ b/tests/kernel/fifo/fifo_api/testcase.yaml @@ -1,8 +1,5 @@ +common: + tags: + - kernel tests: - kernel.fifo: - tags: kernel - kernel.fifo.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y + kernel.fifo: {} diff --git a/tests/kernel/fifo/fifo_timeout/testcase.yaml b/tests/kernel/fifo/fifo_timeout/testcase.yaml index 73ea809e78e..b1b146854a8 100644 --- a/tests/kernel/fifo/fifo_timeout/testcase.yaml +++ b/tests/kernel/fifo/fifo_timeout/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.fifo.timeout: tags: kernel - kernel.fifo.timeout.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/fifo/fifo_usage/testcase.yaml b/tests/kernel/fifo/fifo_usage/testcase.yaml index 0a589880083..8cc3f308e2e 100644 --- a/tests/kernel/fifo/fifo_usage/testcase.yaml +++ b/tests/kernel/fifo/fifo_usage/testcase.yaml @@ -3,8 +3,3 @@ tests: tags: - kernel - fifo - kernel.fifo.usage.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/gen_isr_table/testcase.yaml b/tests/kernel/gen_isr_table/testcase.yaml index d7e45a97050..250d5aca9cc 100644 --- a/tests/kernel/gen_isr_table/testcase.yaml +++ b/tests/kernel/gen_isr_table/testcase.yaml @@ -12,7 +12,8 @@ tests: arch.interrupt.gen_isr_table.arm_baseline.linker_generator: platform_allow: qemu_cortex_m3 filter: CONFIG_GEN_ISR_TABLES and CONFIG_ARMV6_M_ARMV8_M_BASELINE - tags: linker_generator + tags: + - linker_generator extra_configs: - CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/interrupt/testcase.yaml b/tests/kernel/interrupt/testcase.yaml index b816d0aab0a..ba94c20b8b4 100644 --- a/tests/kernel/interrupt/testcase.yaml +++ b/tests/kernel/interrupt/testcase.yaml @@ -6,11 +6,3 @@ tests: - kernel - interrupt filter: not CONFIG_TRUSTED_EXECUTION_NONSECURE - - arch.interrupt.linker_generator: - platform_allow: qemu_cortex_m3 - tags: - - interrupt - - linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/lifo/lifo_api/testcase.yaml b/tests/kernel/lifo/lifo_api/testcase.yaml index 5988f359fb5..f48d90e00a2 100644 --- a/tests/kernel/lifo/lifo_api/testcase.yaml +++ b/tests/kernel/lifo/lifo_api/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.lifo: tags: kernel - kernel.lifo.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/lifo/lifo_usage/testcase.yaml b/tests/kernel/lifo/lifo_usage/testcase.yaml index 3b3cef178a5..96eb7c35712 100644 --- a/tests/kernel/lifo/lifo_usage/testcase.yaml +++ b/tests/kernel/lifo/lifo_usage/testcase.yaml @@ -4,8 +4,3 @@ tests: platform_exclude: m2gl025_miv tags: kernel min_ram: 20 - kernel.lifo.usage.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mbox/mbox_api/testcase.yaml b/tests/kernel/mbox/mbox_api/testcase.yaml index 1fb68168049..d0527e41054 100644 --- a/tests/kernel/mbox/mbox_api/testcase.yaml +++ b/tests/kernel/mbox/mbox_api/testcase.yaml @@ -3,8 +3,3 @@ tests: tags: - kernel - mailbox - kernel.mailbox.api.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mbox/mbox_usage/testcase.yaml b/tests/kernel/mbox/mbox_usage/testcase.yaml index 65e5d7fa7ef..6b26a8bee8d 100644 --- a/tests/kernel/mbox/mbox_usage/testcase.yaml +++ b/tests/kernel/mbox/mbox_usage/testcase.yaml @@ -3,8 +3,3 @@ tests: tags: - kernel - mailbox - kernel.mailbox.usage.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_heap/k_heap_api/testcase.yaml b/tests/kernel/mem_heap/k_heap_api/testcase.yaml index 736c857d3c9..57d5e2c5290 100644 --- a/tests/kernel/mem_heap/k_heap_api/testcase.yaml +++ b/tests/kernel/mem_heap/k_heap_api/testcase.yaml @@ -1,12 +1,5 @@ tests: kernel.k_heap_api: tags: - - k_heap_api + - heap - kernel - kernel.k_heap_api.linker_generator: - platform_allow: qemu_cortex_m3 - tags: - - kernel - - linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_heap/mheap_api_concept/testcase.yaml b/tests/kernel/mem_heap/mheap_api_concept/testcase.yaml index f025285251a..8426487a9db 100644 --- a/tests/kernel/mem_heap/mheap_api_concept/testcase.yaml +++ b/tests/kernel/mem_heap/mheap_api_concept/testcase.yaml @@ -28,9 +28,3 @@ tests: - qemu_cortex_m3 extra_configs: - CONFIG_MULTITHREADING=n - kernel.memory_heap.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_IRQ_OFFLOAD=y - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_slab/mslab/testcase.yaml b/tests/kernel/mem_slab/mslab/testcase.yaml index b1b995f6797..c941019277e 100644 --- a/tests/kernel/mem_slab/mslab/testcase.yaml +++ b/tests/kernel/mem_slab/mslab/testcase.yaml @@ -3,8 +3,3 @@ tests: tags: - kernel - memory_slabs - kernel.memory_slabs.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_slab/mslab_api/testcase.yaml b/tests/kernel/mem_slab/mslab_api/testcase.yaml index b8028f0b815..6cfc5eeb8ec 100644 --- a/tests/kernel/mem_slab/mslab_api/testcase.yaml +++ b/tests/kernel/mem_slab/mslab_api/testcase.yaml @@ -27,8 +27,3 @@ tests: - qemu_arc_hs extra_configs: - CONFIG_MULTITHREADING=n - kernel.memory_slabs.api.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_slab/mslab_concept/testcase.yaml b/tests/kernel/mem_slab/mslab_concept/testcase.yaml index 7dad42c4cc4..866806302fe 100644 --- a/tests/kernel/mem_slab/mslab_concept/testcase.yaml +++ b/tests/kernel/mem_slab/mslab_concept/testcase.yaml @@ -2,8 +2,3 @@ tests: kernel.memory_slabs.concept: tags: kernel timeout: 80 - kernel.memory_slabs.concept.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mem_slab/mslab_threadsafe/testcase.yaml b/tests/kernel/mem_slab/mslab_threadsafe/testcase.yaml index c6f20f2fe05..b744ef8c0af 100644 --- a/tests/kernel/mem_slab/mslab_threadsafe/testcase.yaml +++ b/tests/kernel/mem_slab/mslab_threadsafe/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.memory_slabs.threadsafe: tags: kernel - kernel.memory_slabs.threadsafe.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/mp/testcase.yaml b/tests/kernel/mp/testcase.yaml index 1cf5d3dd637..010587381c1 100644 --- a/tests/kernel/mp/testcase.yaml +++ b/tests/kernel/mp/testcase.yaml @@ -4,9 +4,3 @@ tests: - kernel - smp filter: CONFIG_MP_MAX_NUM_CPUS > 1 - kernel.multiprocessing.linker_generator: - platform_allow: qemu_x86_64 - tags: linker_generator - filter: CONFIG_MP_MAX_NUM_CPUS > 1 - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/msgq/msgq_usage/testcase.yaml b/tests/kernel/msgq/msgq_usage/testcase.yaml index bacf6fb2bf2..a991899a6f1 100644 --- a/tests/kernel/msgq/msgq_usage/testcase.yaml +++ b/tests/kernel/msgq/msgq_usage/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.message_queue_usage: tags: kernel - kernel.message_queue_usage.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/sched/deadline/testcase.yaml b/tests/kernel/sched/deadline/testcase.yaml index af5220b5acb..b77bb0ee930 100644 --- a/tests/kernel/sched/deadline/testcase.yaml +++ b/tests/kernel/sched/deadline/testcase.yaml @@ -1,8 +1,3 @@ tests: kernel.scheduler.deadline: tags: kernel - kernel.scheduler.deadline.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/sched/metairq/testcase.yaml b/tests/kernel/sched/metairq/testcase.yaml index c19ffe0b17f..041d7d0b696 100644 --- a/tests/kernel/sched/metairq/testcase.yaml +++ b/tests/kernel/sched/metairq/testcase.yaml @@ -2,8 +2,3 @@ tests: kernel.scheduler.metairq: tags: kernel platform_exclude: nrf52dk_nrf52810 - kernel.scheduler.metairq.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/sched/preempt/testcase.yaml b/tests/kernel/sched/preempt/testcase.yaml index 3618156cc4a..5aa32450d8e 100644 --- a/tests/kernel/sched/preempt/testcase.yaml +++ b/tests/kernel/sched/preempt/testcase.yaml @@ -2,9 +2,3 @@ tests: kernel.scheduler.preempt: tags: kernel platform_exclude: nrf52dk_nrf52810 - kernel.scheduler.preempt.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - platform_exclude: nrf52dk_nrf52810 - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/sched/schedule_api/testcase.yaml b/tests/kernel/sched/schedule_api/testcase.yaml index 49585db99ed..b5a7a2ae7c6 100644 --- a/tests/kernel/sched/schedule_api/testcase.yaml +++ b/tests/kernel/sched/schedule_api/testcase.yaml @@ -37,10 +37,3 @@ tests: extra_args: CONF_FILE=prj_dumb.conf extra_configs: - CONFIG_TIMESLICING=n - kernel.scheduler.linker_generator: - filter: not CONFIG_SCHED_MULTIQ - platform_allow: qemu_cortex_m3 - extra_configs: - - CONFIG_TIMESLICING=y - - CONFIG_CMAKE_LINKER_GENERATOR=y - tags: linker_generator diff --git a/tests/kernel/smp/testcase.yaml b/tests/kernel/smp/testcase.yaml index f0b59cebdf8..70d0331122e 100644 --- a/tests/kernel/smp/testcase.yaml +++ b/tests/kernel/smp/testcase.yaml @@ -5,10 +5,3 @@ tests: - smp ignore_faults: true filter: (CONFIG_MP_MAX_NUM_CPUS > 1) - kernel.multiprocessing.smp.linker_generator: - platform_allow: qemu_x86_64 - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y - tags: linker_generator - ignore_faults: true - filter: (CONFIG_MP_MAX_NUM_CPUS > 1) diff --git a/tests/kernel/timer/timer_monotonic/testcase.yaml b/tests/kernel/timer/timer_monotonic/testcase.yaml index 5c7f3f3f792..0e96cb17cbd 100644 --- a/tests/kernel/timer/timer_monotonic/testcase.yaml +++ b/tests/kernel/timer/timer_monotonic/testcase.yaml @@ -15,8 +15,3 @@ tests: extra_configs: - CONFIG_APIC_TSC_DEADLINE_TIMER=y - CONFIG_HPET_TIMER=n - kernel.timer.monotonic.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/workq/critical/testcase.yaml b/tests/kernel/workq/critical/testcase.yaml index 4b09738b3fa..d87aaca4ce4 100644 --- a/tests/kernel/workq/critical/testcase.yaml +++ b/tests/kernel/workq/critical/testcase.yaml @@ -1,6 +1,5 @@ common: tags: - - kernel - workqueue tests: @@ -15,8 +14,3 @@ tests: platform_allow: nsim_sem_mpu_stack_guard extra_configs: - CONFIG_TEST_HW_STACK_PROTECTION=n - kernel.workqueue.critical.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/workq/work/testcase.yaml b/tests/kernel/workq/work/testcase.yaml index a7e8b53f556..acbc85d2446 100644 --- a/tests/kernel/workq/work/testcase.yaml +++ b/tests/kernel/workq/work/testcase.yaml @@ -6,8 +6,3 @@ tests: # the related CI checks got blocked, so exclude it. platform_exclude: hifive1 timeout: 80 - kernel.work.api.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y diff --git a/tests/kernel/workq/work_queue/testcase.yaml b/tests/kernel/workq/work_queue/testcase.yaml index 9fac076994c..a75e33ad0cc 100644 --- a/tests/kernel/workq/work_queue/testcase.yaml +++ b/tests/kernel/workq/work_queue/testcase.yaml @@ -1,9 +1,6 @@ tests: kernel.workqueue: min_flash: 34 - tags: kernel - kernel.workqueue.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y + tags: + - kernel + - workqueue diff --git a/tests/kernel/xip/testcase.yaml b/tests/kernel/xip/testcase.yaml index 5fe37f45d70..3497ffdb134 100644 --- a/tests/kernel/xip/testcase.yaml +++ b/tests/kernel/xip/testcase.yaml @@ -7,8 +7,3 @@ tests: integration_platforms: - qemu_arc_em - qemu_x86_xip - arch.common.xip.linker_generator: - platform_allow: qemu_cortex_m3 - tags: linker_generator - extra_configs: - - CONFIG_CMAKE_LINKER_GENERATOR=y