From ac8765942f6f484b12b34319dad9caf2057a4d5f Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 30 Aug 2024 09:34:10 -0400 Subject: [PATCH] samples: overhaul filtering and use platform_key where it makes sense overhaul filtering and use platform_key where it makes sense. Some scenarios are limited now with platform_allow to provide enoug coverage for those sample and not consume resource without value in CI. Signed-off-by: Anas Nashif --- samples/cpp/cpp_synchronization/sample.yaml | 20 ++++++++----------- samples/cpp/hello_world/sample.yaml | 3 +++ samples/hello_world/sample.yaml | 2 ++ .../condition_variables/condvar/sample.yaml | 2 ++ .../condition_variables/simple/sample.yaml | 2 ++ samples/kernel/metairq_dispatch/sample.yaml | 2 ++ samples/philosophers/sample.yaml | 18 +++++++++++++++++ 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/samples/cpp/cpp_synchronization/sample.yaml b/samples/cpp/cpp_synchronization/sample.yaml index 7d8bf2c0b002fc..fa887d696501ee 100644 --- a/samples/cpp/cpp_synchronization/sample.yaml +++ b/samples/cpp/cpp_synchronization/sample.yaml @@ -1,13 +1,15 @@ sample: name: Syncronisation (C++) +common: + platform_key: + - arch + tags: cpp + toolchain_exclude: + - xcc + integration_platforms: + - qemu_x86 tests: sample.cpp.synchronization: - tags: cpp - toolchain_exclude: - - issm - - xcc - integration_platforms: - - qemu_x86 harness: console harness_config: type: multi_line @@ -19,12 +21,6 @@ tests: filter: CONFIG_PICOLIBC_SUPPORTED extra_configs: - CONFIG_PICOLIBC=y - tags: cpp - toolchain_exclude: - - issm - - xcc - integration_platforms: - - qemu_x86 harness: console harness_config: type: multi_line diff --git a/samples/cpp/hello_world/sample.yaml b/samples/cpp/hello_world/sample.yaml index 244c7b4f3453c6..a69ef142de2202 100644 --- a/samples/cpp/hello_world/sample.yaml +++ b/samples/cpp/hello_world/sample.yaml @@ -2,6 +2,9 @@ sample: description: Hello World C++ sample, the simplest C++ Zephyr application name: hello cpp world common: + platform_key: + - arch + - simulation tags: introduction integration_platforms: - qemu_riscv32 diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml index 1bcb7db62f2555..674533cf2b5551 100644 --- a/samples/hello_world/sample.yaml +++ b/samples/hello_world/sample.yaml @@ -3,6 +3,8 @@ sample: application name: hello world common: + platform_key: + - arch tags: introduction integration_platforms: - native_sim diff --git a/samples/kernel/condition_variables/condvar/sample.yaml b/samples/kernel/condition_variables/condvar/sample.yaml index d2a68fbdce4977..1e4c17d55512f5 100644 --- a/samples/kernel/condition_variables/condvar/sample.yaml +++ b/samples/kernel/condition_variables/condvar/sample.yaml @@ -1,5 +1,7 @@ tests: sample.kernel.cond_var: + platform_key: + - arch integration_platforms: - native_sim tags: diff --git a/samples/kernel/condition_variables/simple/sample.yaml b/samples/kernel/condition_variables/simple/sample.yaml index 0b260a8a7e30cc..e7ec9daabed02a 100644 --- a/samples/kernel/condition_variables/simple/sample.yaml +++ b/samples/kernel/condition_variables/simple/sample.yaml @@ -1,5 +1,7 @@ tests: sample.kernel.cond_var.simple: + platform_key: + - arch integration_platforms: - native_sim tags: diff --git a/samples/kernel/metairq_dispatch/sample.yaml b/samples/kernel/metairq_dispatch/sample.yaml index 38431c15c57400..47496f5a7a4ce9 100644 --- a/samples/kernel/metairq_dispatch/sample.yaml +++ b/samples/kernel/metairq_dispatch/sample.yaml @@ -3,6 +3,8 @@ sample: MetaIRQ thread name: MetaIRQ Dispatch common: + platform_key: + - arch tags: - kernel integration_platforms: diff --git a/samples/philosophers/sample.yaml b/samples/philosophers/sample.yaml index 5ca2a2d8340209..d3e0ec380594de 100644 --- a/samples/philosophers/sample.yaml +++ b/samples/philosophers/sample.yaml @@ -1,6 +1,8 @@ sample: name: Dining Philosophers common: + platform_key: + - arch extra_args: DEBUG_PRINTF=1 tags: - introduction @@ -20,24 +22,40 @@ common: tests: sample.kernel.philosopher: {} sample.kernel.philosopher.same_prio: + platform_allow: + - native_sim extra_args: SAME_PRIO=1 sample.kernel.philosopher.static: + platform_allow: + - native_sim extra_args: STATIC_OBJS=1 sample.kernel.philosopher.semaphores: + platform_allow: + - native_sim extra_args: FORKS=SEMAPHORES sample.kernel.philosopher.stacks: + platform_allow: + - native_sim extra_args: FORKS=STACKS sample.kernel.philosopher.fifos: + platform_allow: + - native_sim extra_args: FORKS=FIFOS sample.kernel.philosopher.lifos: + platform_allow: + - native_sim extra_args: FORKS=LIFOS sample.kernel.philosopher.preempt_only: + platform_allow: + - native_sim extra_configs: - CONFIG_NUM_PREEMPT_PRIORITIES=6 - CONFIG_NUM_COOP_PRIORITIES=0 - CONFIG_BT=n - CONFIG_NETWORKING=n sample.kernel.philosopher.coop_only: + platform_allow: + - native_sim extra_configs: - CONFIG_NUM_PREEMPT_PRIORITIES=0 - CONFIG_NUM_COOP_PRIORITIES=7