Skip to content

Commit 273bca0

Browse files
committed
tests: Fixing output or init_entry object access
Following the changes on struct init_entry Signed-off-by: Tomasz Bursztyka <[email protected]>
1 parent bae8b46 commit 273bca0

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

tests/lib/devicetree/devices/src/main.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,29 +70,29 @@ DEVICE_DT_DEFINE(TEST_NOLABEL, dev_init, NULL,
7070
ZTEST(devicetree_devices, test_init_get)
7171
{
7272
/* Check device pointers */
73-
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->dev,
73+
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->init_obj.dev,
7474
DEVICE_DT_GET(TEST_GPIO));
75-
zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->dev,
75+
zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->init_obj.dev,
7676
DEVICE_DT_GET(TEST_I2C));
77-
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->dev,
77+
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->init_obj.dev,
7878
DEVICE_DT_GET(TEST_DEVA));
79-
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->dev,
79+
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->init_obj.dev,
8080
DEVICE_DT_GET(TEST_DEVB));
81-
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->dev,
81+
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->init_obj.dev,
8282
DEVICE_DT_GET(TEST_GPIOX));
83-
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->dev,
83+
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->init_obj.dev,
8484
DEVICE_DT_GET(TEST_DEVC));
85-
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION_OUTER)->dev,
85+
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION_OUTER)->init_obj.dev,
8686
DEVICE_DT_GET(TEST_PARTITION_OUTER));
87-
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION0)->dev,
87+
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION0)->init_obj.dev,
8888
DEVICE_DT_GET(TEST_PARTITION0));
89-
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION1)->dev,
89+
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION1)->init_obj.dev,
9090
DEVICE_DT_GET(TEST_PARTITION1));
91-
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->dev,
91+
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->init_obj.dev,
9292
DEVICE_DT_GET(TEST_GPIO_INJECTED));
93-
zassert_equal(DEVICE_INIT_GET(manual_dev)->dev,
93+
zassert_equal(DEVICE_INIT_GET(manual_dev)->init_obj.dev,
9494
DEVICE_GET(manual_dev));
95-
zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->dev,
95+
zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->init_obj.dev,
9696
DEVICE_DT_GET(TEST_NOLABEL));
9797

9898
/* Check init functions */

tests/misc/check_init_priorities/validate_check_init_priorities_output.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"__init___device_dts_ord_33: init_fn_1(__device_dts_ord_33)",
2323
"__init___device_dts_ord_34: NULL(__device_dts_ord_34)",
2424
"__init___device_dts_ord_35: NULL(__device_dts_ord_35)",
25-
"__init_posix_arch_console_init: posix_arch_console_init(NULL)",
25+
"__init_posix_arch_console_init: posix_arch_console_init(__service_posix_arch_console_init)",
2626
"PRE_KERNEL_2",
27-
"__init_sys_clock_driver_init: sys_clock_driver_init(NULL)",
27+
"__init_sys_clock_driver_init: sys_clock_driver_init(__service_sys_clock_driver_init)",
2828
"POST_KERNEL",
2929
"APPLICATION",
3030
"SMP",

0 commit comments

Comments
 (0)