tests: cmake: snippets: Add board revision check

nordicjm · nordicjm · commit 9861e8c66d95 · 2025-10-22T09:56:02.000+01:00
Adds a check that snippets are correctly applied to named boards
with the correct board revision

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/tests/cmake/snippets/Kconfig b/tests/cmake/snippets/Kconfig
@@ -37,6 +37,16 @@ config TEST_TYPE_BAR_FOO
 	help
 	  Test the snippet processing order (1. bar, 2. foo)
 
+config TEST_TYPE_VER_CHECK
+	bool "Test Type: Version check"
+	help
+	  Test board version snippet application
+
+config TEST_TYPE_VER_CHECK_SPECIFIC
+	bool "Test Type: Version check specific"
+	help
+	  Test board version snippet application with specific board version
+
 endchoice
 
 # Test values set by the snippet config overlays and tested by the test logic
@@ -57,3 +67,14 @@ config TEST_COMMON_VAL
 	help
 	  This option's value should be overridden by the snippet config
 	  overlays.
+
+# Used for testing board version snippets
+config TEST_VER_CHECK_APPLIED
+	bool "Test version check snippet applied"
+	help
+	  This option's value should be set by the ver_check snippet.
+
+config TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED
+	bool "Test version check with board version snippet applied"
+	help
+	  This option's value should be set by the ver_check snippet.
diff --git a/tests/cmake/snippets/snippets/ver_check/snippet.yml b/tests/cmake/snippets/snippets/ver_check/snippet.yml
@@ -0,0 +1,9 @@
+name: ver_check
+boards:
+  nrf9160dk/nrf9160:
+    revisions:
+      "0.7.0":
+        append:
+          EXTRA_CONF_FILE: ver_check_0_7_0.conf
+    append:
+      EXTRA_CONF_FILE: ver_check.conf
diff --git a/tests/cmake/snippets/snippets/ver_check/ver_check.conf b/tests/cmake/snippets/snippets/ver_check/ver_check.conf
@@ -0,0 +1,2 @@
+CONFIG_TEST_VER_CHECK_APPLIED=y
+CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED=n
diff --git a/tests/cmake/snippets/snippets/ver_check/ver_check_0_7_0.conf b/tests/cmake/snippets/snippets/ver_check/ver_check_0_7_0.conf
@@ -0,0 +1 @@
+CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED=y
diff --git a/tests/cmake/snippets/src/main.c b/tests/cmake/snippets/src/main.c
@@ -19,6 +19,23 @@
 #define TEST_BAR_VAL_BAR		(964183)
 #define TEST_COMMON_VAL_BAR		(109234)
 
+/* Check board-specific snippet files */
+#if defined(CONFIG_TEST_TYPE_VER_CHECK)
+#if !defined(CONFIG_TEST_VER_CHECK_APPLIED)
+#error "Base ver_check snippet has not been applied"
+#endif
+#if defined(CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED)
+#error "Board specific ver_check snippet has wrongly been applied"
+#endif
+#elif defined(CONFIG_TEST_TYPE_VER_CHECK_SPECIFIC)
+#if !defined(CONFIG_TEST_VER_CHECK_APPLIED)
+#error "Base ver_check snippet has not been applied"
+#endif
+#if !defined(CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED)
+#error "Board specific ver_check snippet has not been applied"
+#endif
+#endif
+
 ZTEST_SUITE(snippet_tests, NULL, NULL, NULL, NULL, NULL);
 
 ZTEST(snippet_tests, test_overlay_config)
diff --git a/tests/cmake/snippets/testcase.yaml b/tests/cmake/snippets/testcase.yaml
@@ -1,36 +1,83 @@
 common:
   tags: snippets
-  platform_allow:
-  - native_sim
-  - qemu_x86
-  - qemu_x86_64
-  - qemu_cortex_m3
-  integration_platforms:
-  - native_sim
   sysbuild: false
 
 tests:
   # Test the initial state with no snippets applied
   buildsystem.snippets.none:
     extra_configs:
     - CONFIG_TEST_TYPE_NONE=y
+    platform_allow:
+    - native_sim
+    - qemu_x86
+    - qemu_x86_64
+    - qemu_cortex_m3
+    integration_platforms:
+    - native_sim
   # Test the `foo` snippet from the default application snippet root
   buildsystem.snippets.foo:
     extra_args: SNIPPET="foo"
     extra_configs:
     - CONFIG_TEST_TYPE_FOO=y
+    platform_allow:
+    - native_sim
+    - qemu_x86
+    - qemu_x86_64
+    - qemu_cortex_m3
+    integration_platforms:
+    - native_sim
   # Test the `bar` snippet from an extra snippet root
   buildsystem.snippets.bar:
     extra_args: SNIPPET="bar"
     extra_configs:
     - CONFIG_TEST_TYPE_BAR=y
+    platform_allow:
+    - native_sim
+    - qemu_x86
+    - qemu_x86_64
+    - qemu_cortex_m3
+    integration_platforms:
+    - native_sim
   # Test the snippet processing order (1. foo, 2. bar)
   buildsystem.snippets.foo_bar:
     extra_args: SNIPPET="foo;bar"
     extra_configs:
     - CONFIG_TEST_TYPE_FOO_BAR=y
+    platform_allow:
+    - native_sim
+    - qemu_x86
+    - qemu_x86_64
+    - qemu_cortex_m3
+    integration_platforms:
+    - native_sim
   # Test the snippet processing order (1. bar, 2. foo)
   buildsystem.snippets.bar_foo:
     extra_args: SNIPPET="bar;foo"
     extra_configs:
     - CONFIG_TEST_TYPE_BAR_FOO=y
+    platform_allow:
+    - native_sim
+    - qemu_x86
+    - qemu_x86_64
+    - qemu_cortex_m3
+    integration_platforms:
+    - native_sim
+  # Test the snippet board version processing
+  buildsystem.snippets.version_exclude:
+    extra_args: SNIPPET="ver_check"
+    extra_configs:
+    - CONFIG_TEST_TYPE_VER_CHECK=y
+    platform_allow:
+    - nrf9160dk@0.14.0/nrf9160
+    integration_platforms:
+    - nrf9160dk@0.14.0/nrf9160
+    build_only: true
+  buildsystem.snippets.version_include:
+    extra_args: SNIPPET="ver_check"
+    extra_configs:
+    - CONFIG_TEST_TYPE_VER_CHECK_SPECIFIC=y
+    platform_allow:
+    - nrf9160dk@0.7.0/nrf9160
+    integration_platforms:
+    - nrf9160dk@0.7.0/nrf9160
+    build_only: true

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CONFIG_TEST_VER_CHECK_APPLIED=y`
	`2`	`+CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED=n`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CONFIG_TEST_VER_CHECK_SPECIFIC_VERSION_APPLIED=y`