Skip to content

Fix child node dependencies #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v3.5.0+zmk-fixes
Choose a base branch
from
Open

Fix child node dependencies #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions scripts/build/check_init_priorities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,23 +286,12 @@ def _check_dep(self, dev_ord, dep_ord):
self.log.info(
f"{dev_node.path} {dev_prio} > {dep_node.path} {dep_prio}")

def _check_edt_r(self, dev_ord, dev):
"""Recursively check for dependencies of a device."""
for dep in dev.depends_on:
self._check_dep(dev_ord, dep.dep_ordinal)
if dev._binding and dev._binding.child_binding:
for child in dev.children.values():
if "compatible" in child.props:
continue
if dev._binding.path != child._binding.path:
continue
self._check_edt_r(dev_ord, child)

def check_edt(self):
"""Scan through all known devices and validate the init priorities."""
for dev_ord in self._obj.devices:
dev = self._ord2node[dev_ord]
self._check_edt_r(dev_ord, dev)
for dep in dev.depends_on:
self._check_dep(dev_ord, dep.dep_ordinal)

def print_initlevels(self):
for level, calls in self._obj.initlevels.items():
Expand Down
48 changes: 14 additions & 34 deletions scripts/build/check_init_priorities_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,52 +381,32 @@ def test_check_ignored(self, mock_vinit):

@mock.patch("check_init_priorities.Validator._check_dep")
@mock.patch("check_init_priorities.Validator.__init__", return_value=None)
def test_check_edt_r(self, mock_vinit, mock_cd):
validator = check_init_priorities.Validator("", "", None)

def test_check_edt(self, mock_vinit, mock_cd):
d0 = mock.Mock()
d0.dep_ordinal = 1
d1 = mock.Mock()
d1.dep_ordinal = 2
d2 = mock.Mock()
d2.dep_ordinal = 3

c0 = mock.Mock()
c0.props = {"compatible": "c"}
c1 = mock.Mock()
c1.props = {}
c1._binding.path = "another-binding-path.yaml"
c2 = mock.Mock()
c2.props = {}
c2._binding.path = "binding-path.yaml"
c2._binding.child_binding = None
c2.depends_on = [d1]

dev = mock.Mock()
dev.depends_on = [d0]
dev._binding.child_binding = "child-binding"
dev._binding.path = "binding-path.yaml"
dev.children.values.return_value = [c0, c1, c2]

validator._check_edt_r(0, dev)

self.assertListEqual(mock_cd.call_args_list, [
mock.call(0, 1),
mock.call(0, 2),
])
dev0 = mock.Mock()
dev0.depends_on = [d0]
dev1 = mock.Mock()
dev1.depends_on = [d1]
dev2 = mock.Mock()
dev2.depends_on = [d2]

@mock.patch("check_init_priorities.Validator._check_edt_r")
@mock.patch("check_init_priorities.Validator.__init__", return_value=None)
def test_check_edt(self, mock_vinit, mock_cer):
validator = check_init_priorities.Validator("", "", None)
validator._ord2node = {1: mock.Mock(), 2: mock.Mock(), 3: mock.Mock()}
validator._ord2node = {1: dev0, 2: dev1, 3: dev2}
validator._obj = mock.Mock()
validator._obj.devices = {1: 10, 2: 10, 3: 20}

validator.check_edt()

self.assertListEqual(mock_cer.call_args_list, [
mock.call(1, validator._ord2node[1]),
mock.call(2, validator._ord2node[2]),
mock.call(3, validator._ord2node[3]),
self.assertListEqual(mock_cd.call_args_list, [
mock.call(1, 1),
mock.call(2, 2),
mock.call(3, 3),
])

if __name__ == "__main__":
Expand Down
Loading