tests and samples: Add relevant service and device init modifiers

tbursztyka · tbursztyka · commit d5578fdd800c · 2024-11-26T19:29:20.000+01:00
A few test and samples require explicit dependency resolution as the
devices they introduce do not have any DTS counter-part.

Signed-off-by: Tomasz Bursztyka &lt;tomasz.bursztyka@proton.me&gt;
diff --git a/samples/subsys/pm/device_pm/service_and_device_init.yaml b/samples/subsys/pm/device_pm/service_and_device_init.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  dummy_driver:
+    init:
+      dependencies:
+        - dummy_parent
diff --git a/samples/subsys/shell/shell_module/boards/qemu_x86_64.conf b/samples/subsys/shell/shell_module/boards/qemu_x86_64.conf
@@ -0,0 +1,5 @@
+CONFIG_PCIE=y
+CONFIG_PCIE_SHELL=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SHELL=y
+CONFIG_EARLY_CONSOLE=y
diff --git a/samples/userspace/prod_consumer/src/sample_driver.h b/samples/userspace/prod_consumer/src/sample_driver.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/device.h>
 
-#define SAMPLE_DRIVER_NAME_0	"SAMPLE_DRIVER_0"
+#define SAMPLE_DRIVER_NAME_0	"sample_driver_foo_0"
 #define SAMPLE_DRIVER_MSG_SIZE	128
 
 typedef void (*sample_driver_callback_t)(const struct device *dev,
diff --git a/tests/drivers/ipm/service_and_device_init.yaml b/tests/drivers/ipm/service_and_device_init.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  ipm_console_send0:
+    init:
+      dependencies:
+        - ipm_dummy0
+
+  ipm_console_recv0:
+    init:
+      dependencies:
+        - ipm_dummy0
diff --git a/tests/drivers/smbus/smbus_emul/src/smbus.c b/tests/drivers/smbus/smbus_emul/src/smbus.c
@@ -97,7 +97,7 @@ static struct pch_config pch_config_data = {
 	.pcie = &pcie_params,
 };
 
-DEVICE_INSTANCE(dummy_driver, &pch_smbus_init,
+DEVICE_INSTANCE(smbus_emul, &pch_smbus_init,
 	      NULL, &smbus_data, &pch_config_data, POST_KERNEL,
 	      &funcs);
 
diff --git a/tests/kernel/device/service_and_device_init.yaml b/tests/kernel/device/service_and_device_init.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  my_driver_level_2:
+    init:
+      dependencies:
+        - my_driver_priority_1
+
+  my_driver_priority_3:
+    init:
+      dependencies:
+        - my_driver_priority_2
+
+  my_driver_priority_4:
+    init:
+      dependencies:
+        - my_driver_priority_3
diff --git a/tests/lib/devicetree/devices/service_and_device_init.yaml b/tests/lib/devicetree/devices/service_and_device_init.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  test_dev_a:
+    init:
+      dependencies:
+        - test_i2c
+
+  test_gpiox:
+    init:
+      dependencies:
+        - test_dev_a
+
+  test_dev_b:
+    init:
+      dependencies:
+        - test_gpiox
+
+  test_dev_c:
+    init:
+      dependencies:
+        - test_dev_b
+
+  test_p0:
+    init:
+      dependencies:
+        - test_dev_c
+
+  test_gpio_injected:
+    init:
+      dependencies:
+        - test_dev_b
+        - test_p0
+
+  manual_dev:
+    init:
+      dependencies:
+        - test_gpio_injected
+
+  test-i2c-dev@14:
+    init:
+      dependencies:
+        - manual_dev
diff --git a/tests/lib/devicetree/devices/src/main.c b/tests/lib/devicetree/devices/src/main.c
@@ -40,7 +40,6 @@ DEVICE_INSTANCE(TEST_I2C, dev_init, NULL,
 		 NULL, NULL, POST_KERNEL, NULL);
 DEVICE_INSTANCE(TEST_DEVA, dev_init, NULL,
 		 NULL, NULL, POST_KERNEL, NULL);
-/* NB: Intentional init devb before required gpiox */
 DEVICE_INSTANCE(TEST_DEVB, dev_init, NULL,
 		 NULL, NULL, POST_KERNEL, NULL);
 DEVICE_INSTANCE(TEST_GPIOX, dev_init, NULL,
@@ -50,8 +49,8 @@ DEVICE_INSTANCE(TEST_DEVC, dev_init, NULL,
 DEVICE_INSTANCE(TEST_PARTITION, dev_init, NULL,
 		 NULL, NULL, POST_KERNEL, NULL);
 /* Device with both an existing and missing injected dependency */
-DEVICE_DT_DEFINE(TEST_GPIO_INJECTED, dev_init, NULL,
-		 NULL, NULL, POST_KERNEL, 70, NULL, DT_DEP_ORD(TEST_DEVB), 999);
+DEVICE_INSTANCE(TEST_GPIO_INJECTED, dev_init, NULL,
+		 NULL, NULL, POST_KERNEL, NULL);
 /* Manually specified device */
 DEVICE_INSTANCE(manual_dev, dev_init, NULL,
 		 NULL, NULL, POST_KERNEL, NULL);
@@ -104,8 +103,8 @@ ZTEST(devicetree_devices, test_init_order)
 	zassert_equal(init_order[0], DEV_HDL(TEST_GPIO));
 	zassert_equal(init_order[1], DEV_HDL(TEST_I2C));
 	zassert_equal(init_order[2], DEV_HDL(TEST_DEVA));
-	zassert_equal(init_order[3], DEV_HDL(TEST_DEVB));
-	zassert_equal(init_order[4], DEV_HDL(TEST_GPIOX));
+	zassert_equal(init_order[3], DEV_HDL(TEST_GPIOX));
+	zassert_equal(init_order[4], DEV_HDL(TEST_DEVB));
 	zassert_equal(init_order[5], DEV_HDL(TEST_DEVC));
 	zassert_equal(init_order[6], DEV_HDL(TEST_PARTITION));
 	zassert_equal(init_order[7], DEV_HDL(TEST_GPIO_INJECTED));
@@ -259,8 +258,7 @@ ZTEST(devicetree_devices, test_injected)
 	/* TEST_GPIO_INJECTED: TEST_DEVB */
 	dev = device_get_binding(DEVICE_DT_NAME(TEST_GPIO_INJECTED));
 	hdls = device_injected_handles_get(dev, &nhdls);
-	zassert_equal(nhdls, 1);
-	zassert_true(check_handle(DEV_HDL(TEST_DEVB), hdls, nhdls));
+	zassert_equal(nhdls, 0);
 }
 
 ZTEST(devicetree_devices, test_get_or_null)
@@ -284,8 +282,7 @@ ZTEST(devicetree_devices, test_supports)
 	/* TEST_DEVB: None */
 	dev = DEVICE_DT_GET(TEST_DEVB);
 	hdls = device_supported_handles_get(dev, &nhdls);
-	zassert_equal(nhdls, 1);
-	zassert_true(check_handle(DEV_HDL(TEST_GPIO_INJECTED), hdls, nhdls));
+	zassert_equal(nhdls, 0);
 
 	/* TEST_GPIO_INJECTED: None */
 	dev = DEVICE_DT_GET(TEST_GPIO_INJECTED);
diff --git a/tests/net/ieee802154/l2/prj.conf b/tests/net/ieee802154/l2/prj.conf
@@ -10,7 +10,7 @@ CONFIG_NET_LOG=y
 
 CONFIG_NET_L2_IEEE802154=y
 CONFIG_NET_L2_IEEE802154_SECURITY=y
-CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="CRYPTO_MTLS"
+CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="crypto_mtls"
 
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_PACKET=y
diff --git a/tests/net/ieee802154/l2/service_and_device_init.yaml b/tests/net/ieee802154/l2/service_and_device_init.yaml
@@ -0,0 +1,5 @@
+device:
+  fake_ieee80154:
+    init:
+      dependencies:
+        - crypto_mtls
diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
@@ -169,6 +169,6 @@ static struct ieee802154_radio_api fake_radio_api = {
 	.attr_get		= fake_attr_get,
 };
 
-NET_DEVICE_INSTANCE(fake, fake_init, NULL, NULL, NULL,
+NET_DEVICE_INSTANCE(fake_ieee802154, fake_init, NULL, NULL, NULL,
 		&fake_radio_api, IEEE802154_L2,
 		NET_L2_GET_CTX_TYPE(IEEE802154_L2), IEEE802154_MTU);
diff --git a/tests/subsys/shell/shell_device/service_and_device_init.yaml b/tests/subsys/shell/shell_device/service_and_device_init.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  device_1:
+    init:
+      dependencies:
+        - device_0
+
+  device_2:
+    init:
+      dependencies:
+        - device_1
+
+  device_3:
+    init:
+      dependencies:
+        - device_2
+
+  device_4:
+    init:
+      dependencies:
+        - device_3
diff --git a/tests/subsys/shell/shell_device_filter/service_and_device_init.yaml b/tests/subsys/shell/shell_device_filter/service_and_device_init.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024, Tomasz Bursztyka
+#
+# SPDX-License-Identifier: Apache-2.0
+
+device:
+  device_1:
+    init:
+      dependencies:
+        - device_0
+
+  xx_device_2:
+    init:
+      dependencies:
+        - device_1
diff --git a/tests/subsys/shell/shell_device_filter/src/main.c b/tests/subsys/shell/shell_device_filter/src/main.c
@@ -18,13 +18,13 @@ DEVICE_INSTANCE(device_1, NULL, NULL,
 	      NULL, NULL,
 	      POST_KERNEL, NULL);
 
-DEVICE_INSTANCE(device_2, NULL, NULL,
+DEVICE_INSTANCE(xx_device_2, NULL, NULL,
 	      NULL, NULL,
 	      POST_KERNEL, NULL);
 
 static const struct device *d0 = &DEVICE_NAME_GET(device_0);
 static const struct device *d1 = &DEVICE_NAME_GET(device_1);
-static const struct device *d2 = &DEVICE_NAME_GET(device_2);
+static const struct device *d2 = &DEVICE_NAME_GET(xx_device_2);
 
 ZTEST(shell_device_filter, test_unfiltered)
 {
@@ -47,7 +47,7 @@ ZTEST(shell_device_filter, test_prefix)
 
 static bool pm_device_test_filter(const struct device *dev)
 {
-	return strstr(dev->name, "@1") != NULL;
+	return strstr(dev->name, "_1") != NULL;
 }
 
 ZTEST(shell_device_filter, test_filter)
