Commit 0b946dfc authored by Christophe Dufaza's avatar Christophe Dufaza Committed by Mahesh Mahadevan
Browse files

Revert "edtlib: test "last modified" semantic for ... specs" 



This unit test was added to cover the change introduced by [1].

Further work on related issues [2] showed that the chosen approach
is dead end.
We're reverting all changes made in [1].

[1] edtlib: fix last modified semantic in included property specs
[2] edtlib: Preserve paths of properties from included child bindings

See also: #65221, #78095

This reverts commit 70eaa61c.

Signed-off-by: default avatarChristophe Dufaza <chris@openmarl.org>
parent 308b5682

scripts/dts/python-devicetree/tests/test-bindings-include/base.yaml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: BSD-3-Clause



properties:

  x:

    type: int

  y:

    type: int

scripts/dts/python-devicetree/tests/test-bindings-include/modified.yaml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: BSD-3-Clause



include: base.yaml



properties:

  x:

    required: true

scripts/dts/python-devicetree/tests/test-bindings-include/top.yaml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
# SPDX-License-Identifier: BSD-3-Clause



description: |

  Top-level binding file for testing included property spec paths.



  base.yaml: specifies properties "x" and "y"

  modified.yaml: includes base.yaml, modifies property "x"

  top.yaml (this file): includes modified.yaml, specifies property "p"



  From the top-level binding, we expect:

  - "x" was last modified in modified.yaml

  - "y" was last modified in base.yaml

  - "p" was last modified in top.yaml



compatible: top-level



include: modified.yaml



properties:

  p:

    type: int

scripts/dts/python-devicetree/tests/test_edtlib.py

+0 −12
Original line number Diff line number Diff line
@@ -365,18 +365,6 @@ def test_include_filters(): 
        assert set(child.prop2specs.keys()) == {'child-prop-1', 'child-prop-2',

                                                'x', 'z'}  # root level 'y' is blocked



def test_include_paths():

    '''Test "last modified" semantic for included bindings paths.'''



    fname2path = {'base.yaml': 'test-bindings-include/base.yaml',

                  'modified.yaml': 'test-bindings-include/modified.yaml'}



    with from_here():

        top = edtlib.Binding('test-bindings-include/top.yaml', fname2path)



        assert 'modified.yaml' == os.path.basename(top.prop2specs["x"].path)

        assert 'base.yaml' == os.path.basename(top.prop2specs["y"].path)

        assert 'top.yaml' == os.path.basename(top.prop2specs["p"].path)



def test_bus():

    '''Test 'bus:' and 'on-bus:' in bindings'''

CRA Git | Maintained and supported by SUSTech CRA and CCSE