Re: [PATCH 4/5] tests: Fix overlay tests

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]

On Sat, Nov 16, 2024 at 08:30:22PM +0530, Ayush Singh wrote:
> Fix tests broken by introduction of fdt_overlay_prepare()

You should fix the tests in the same patch that broke them.

But.. more to the point, I don't see any reason to rename
fdt_overlay_apply() to fdt_overlay_prepare().  And indeed doing so
will break the ABI.

> 
> Signed-off-by: Ayush Singh <ayush@beagleboard.org>
> ---
>  tests/overlay.c           | 1 +
>  tests/overlay_bad_fixup.c | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/overlay.c b/tests/overlay.c
> index 2d27918a336939743c4ef6bd0c9b93d1e9dfc8fb..9d387aba8f85cf1b5a3d397613708b5c82655b68 100644
> --- a/tests/overlay.c
> +++ b/tests/overlay.c
> @@ -203,6 +203,7 @@ int main(int argc, char *argv[])
>  	fdt_overlay = open_dt(argv[2]);
>  
>  	/* Apply the overlay */
> +	CHECK(fdt_overlay_prepare(fdt_base, fdt_overlay));
>  	CHECK(fdt_overlay_apply(fdt_base, fdt_overlay));
>  
>  	fdt_overlay_change_int_property(fdt_base);
> diff --git a/tests/overlay_bad_fixup.c b/tests/overlay_bad_fixup.c
> index 029bc7982d328b0dd538dd30f066ae414b989232..2f7471a60d926a959ac5dfb66ef02712259e1a4d 100644
> --- a/tests/overlay_bad_fixup.c
> +++ b/tests/overlay_bad_fixup.c
> @@ -51,7 +51,7 @@ int main(int argc, char *argv[])
>  	fdt_overlay = open_dt(argv[2]);
>  
>  	/* Apply the overlay */
> -	CHECK(fdt_overlay_apply(fdt_base, fdt_overlay), -FDT_ERR_BADOVERLAY);
> +	CHECK(fdt_overlay_prepare(fdt_base, fdt_overlay), -FDT_ERR_BADOVERLAY);
>  
>  	PASS();
>  }
> 

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]