From nobody Sun Feb 8 18:49:41 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC8F9369990; Mon, 12 Jan 2026 14:21:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768227718; cv=none; b=ZpGFoCPcjfEVfpcYnzdSZCPJGLpqG1zE8eIwnv9IL/AGB4kH5Q8uc9itheXkq3YUt/ZtW41kd/lziPTlmi2wOeP8LK7fWuZM/ApTbVKAbVCYRk4c0x20KJlgtXkuaNY957PacD4Rv8aFgngE0/6RbKq/PpGqkbupn7OSm1bK5UA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768227718; c=relaxed/simple; bh=C/i3bZYNU7hFPWeOIO4liAFOiYkaM6HH7t8B6P6dEYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OSee1VzTa+bl6LS02UR49gklU2h9fpZGyEDKMBvResOJBDQEhit8lHe1DBp09l629qVxBDZB5dwqSYwXaY/Wb7dI48588ab5sLLWJhlEYZLkz2T00AI35cUtHYt5XI/xeHWN2KloYeJ1mGwZy4ZcvHaT/ia80SXgag3JGNsa8AI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=t9dD7tOu; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="t9dD7tOu" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 58B3D4E42094; Mon, 12 Jan 2026 14:21:55 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2E27A606FA; Mon, 12 Jan 2026 14:21:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A880B103C8CD8; Mon, 12 Jan 2026 15:21:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1768227714; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=lBi3nUNq8ZfOvMorW6kQYzmy743beEuX+jiuAg/FG5k=; b=t9dD7tOu0e3cwKdWn+E10MgvT5EDWUfCOi6AjUZDPglZxqaQJHkyIKmDnTgfK++TkvYA5T Pd0lV0B0g2iFkV+DFwMKpXsSjnqAi1kVOnmsa1Xdon0QUvINYrmQfwpcjpBikoeb1gb/aE vfLxAgJeDOZ9mcd29sCT90RB+Jhoqjik2xvd3S7CQgLQyMvu0a/JHkTQQLwcl7XIh4Lfgo QpZdFzi/feFuE+8aIK8NldrFMInEKvvWLZUUYEKR8tuVdP6TpZB3pQ3PTWsQQLRPo74+n8 0VItYbOwEI9O6f4XcEUNrSfsG0XluKGHffX5VIddP8jWJpjqL4QSQgtfF4JEaQ== From: Herve Codina To: David Gibson , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Ayush Singh , Geert Uytterhoeven , devicetree-compiler@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-spec@vger.kernel.org, Hui Pu , Ian Ray , Luca Ceresoli , Thomas Petazzoni , Herve Codina Subject: [RFC PATCH 61/77] tests: metadata: Add a test related to orphan node merging Date: Mon, 12 Jan 2026 15:19:51 +0100 Message-ID: <20260112142009.1006236-62-herve.codina@bootlin.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112142009.1006236-1-herve.codina@bootlin.com> References: <20260112142009.1006236-1-herve.codina@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Merging orphan node is supported. Add a test for this feature. Signed-off-by: Herve Codina --- 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_a= ddon_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 =3D <0x01>; + prop2 =3D <0x02>; + }; + + addon-node2 { + prop3 =3D <0x03>; + }; +}; + +&base2 { + + addon-node { + prop =3D <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 =3D <0x00000001>; + prop2 =3D <0x00000002>; + }; + addon-node2 { + prop3 =3D <0x00000003>; + }; +}; +&base2 { + addon-node { + prop =3D <0x00000000>; + }; +}; diff --git a/tests/metadata_addon_orphan3.dts b/tests/metadata_addon_orphan= 3.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 =3D <1>; + }; +}; + +&base2 { + addon-node { + prop =3D <0>; + }; +}; + +&base1 { + addon-node1 { + prop2 =3D <2>; + }; + addon-node2 { + prop3 =3D <3>; + }; +}; diff --git a/tests/metadata_addon_orphan3.dts.dts.expect b/tests/metadata_a= ddon_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 =3D <0x01>; + prop2 =3D <0x02>; + }; + + addon-node2 { + prop3 =3D <0x03>; + }; +}; + +&base2 { + + addon-node { + prop =3D <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" --=20 2.52.0