[RFC PATCH 61/77] tests: metadata: Add a test related to orphan node merging
Herve Codina <[email protected]> Mon, 12 Jan 2026 15:19:51 +0100
| Newsgroups | org.kernel.vger.devicetree-spec,org.kernel.vger.devicetree-compiler,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Merging orphan node is supported. Add a test for this feature. Signed-off-by: Herve Codina <[email protected]> --- tests/metadata_addon_orphan3.dtb.dts.expect | 22 ++++++++++++++++ tests/metadata_addon_orphan3.dtb.expect | 17 +++++++++++++ tests/metadata_addon_orphan3.dts | 28 +++++++++++++++++++++ tests/metadata_addon_orphan3.dts.dts.expect | 22 ++++++++++++++++ tests/run_tests.sh | 3 ++- 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 tests/metadata_addon_orphan3.dtb.dts.expect create mode 100644 tests/metadata_addon_orphan3.dtb.expect create mode 100644 tests/metadata_addon_orphan3.dts create mode 100644 tests/metadata_addon_orphan3.dts.dts.expect diff --git a/tests/metadata_addon_orphan3.dtb.dts.expect b/tests/metadata_addon_orphan3.dtb.dts.expect new file mode 100644 index 0000000..2605e1b --- /dev/null +++ b/tests/metadata_addon_orphan3.dtb.dts.expect @@ -0,0 +1,22 @@ +/dts-v1/; +/addon/; + + +&base1 { + + addon-node1 { + prop1 = <0x01>; + prop2 = <0x02>; + }; + + addon-node2 { + prop3 = <0x03>; + }; +}; + +&base2 { + + addon-node { + prop = <0x00>; + }; +}; diff --git a/tests/metadata_addon_orphan3.dtb.expect b/tests/metadata_addon_orphan3.dtb.expect new file mode 100644 index 0000000..5a65483 --- /dev/null +++ b/tests/metadata_addon_orphan3.dtb.expect @@ -0,0 +1,17 @@ +/dts-v1/; +/addon/; + +&base1 { + addon-node1 { + prop1 = <0x00000001>; + prop2 = <0x00000002>; + }; + addon-node2 { + prop3 = <0x00000003>; + }; +}; +&base2 { + addon-node { + prop = <0x00000000>; + }; +}; diff --git a/tests/metadata_addon_orphan3.dts b/tests/metadata_addon_orphan3.dts new file mode 100644 index 0000000..0fe52ec --- /dev/null +++ b/tests/metadata_addon_orphan3.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * Copyright (C) 2026 Bootlin + */ + +/dts-v1/; +/addon/; + +&base1 { + addon-node1 { + prop1 = <1>; + }; +}; + +&base2 { + addon-node { + prop = <0>; + }; +}; + +&base1 { + addon-node1 { + prop2 = <2>; + }; + addon-node2 { + prop3 = <3>; + }; +}; diff --git a/tests/metadata_addon_orphan3.dts.dts.expect b/tests/metadata_addon_orphan3.dts.dts.expect new file mode 100644 index 0000000..2605e1b --- /dev/null +++ b/tests/metadata_addon_orphan3.dts.dts.expect @@ -0,0 +1,22 @@ +/dts-v1/; +/addon/; + + +&base1 { + + addon-node1 { + prop1 = <0x01>; + prop2 = <0x02>; + }; + + addon-node2 { + prop3 = <0x03>; + }; +}; + +&base2 { + + addon-node { + prop = <0x00>; + }; +}; diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 5edc58b..12418bf 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -1128,7 +1128,8 @@ metadata_tests() { for dt in metadata_reflocal metadata_refphandle \ metadata_addon_base metadata_exportsyms_local \ metadata_exportsyms_ref metadata_importsyms \ - metadata_addon_orphan1 metadata_addon_orphan2; do + metadata_addon_orphan1 metadata_addon_orphan2 \ + metadata_addon_orphan3; do run_dtc_test -I dts -O dts -o $dt.dts.dts "$SRCDIR/$dt.dts" base_run_test check_diff $dt.dts.dts "$SRCDIR/$dt.dts.dts.expect" run_dtc_test -I dts -O dtb -o $dt.dtb "$SRCDIR/$dt.dts" -- 2.52.0