[PATCH] tests: Fix overlay_overlay_nosugar test case

[PATCH] tests: Fix overlay_overlay_nosugar test case

[Paul Barker]

This test was accidentally skipped as the wrong test dts file was built.
The fragment numbering in this sugar-free test case needed adjusting to
match the numbering generated by dtc for overlay_overlay.dts.

Signed-off-by: Paul Barker <pbarker-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
---
 tests/overlay_overlay_nosugar.dts | 8 ++++----
 tests/run_tests.sh                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/overlay_overlay_nosugar.dts b/tests/overlay_overlay_nosugar.dts
index b6d841b..b5947e9 100644
--- a/tests/overlay_overlay_nosugar.dts
+++ b/tests/overlay_overlay_nosugar.dts
@@ -48,7 +48,7 @@
 		};
 	};
 
-	fragment@5 {
+	fragment@4 {
 		target = <&test>;
 
 		__overlay__ {
@@ -58,7 +58,7 @@
 		};
 	};
 
-	fragment@6 {
+	fragment@5 {
 		target = <&test>;
 
 		__overlay__ {
@@ -66,7 +66,7 @@
 		};
 	};
 
-	fragment@7 {
+	fragment@6 {
 		target = <&test>;
 
 		__overlay__ {
@@ -74,7 +74,7 @@
 		};
 	};
 
-	fragment@8 {
+	fragment@7 {
 		target = <&test>;
 
 		__overlay__ {
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 294585b..4b8dada 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -288,7 +288,7 @@ dtc_overlay_tests () {
     run_test check_path overlay_overlay.test.dtb exists "/__local_fixups__"
 
     # Without syntactic sugar
-    run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb "$SRCDIR/overlay_overlay.dts"
+    run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb "$SRCDIR/overlay_overlay_nosugar.dts"
     run_test check_path overlay_overlay_nosugar.test.dtb not-exists "/__symbols__"
     run_test check_path overlay_overlay_nosugar.test.dtb exists "/__fixups__"
     run_test check_path overlay_overlay_nosugar.test.dtb exists "/__local_fixups__"
-- 
2.26.2

Re: [PATCH] tests: Fix overlay_overlay_nosugar test case

[David Gibson]

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

On Sat, Dec 19, 2020 at 02:35:21PM +0000, Paul Barker wrote:
> This test was accidentally skipped as the wrong test dts file was built.
> The fragment numbering in this sugar-free test case needed adjusting to
> match the numbering generated by dtc for overlay_overlay.dts.
> 
> Signed-off-by: Paul Barker <pbarker-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>

Applied, thanks.

> ---
>  tests/overlay_overlay_nosugar.dts | 8 ++++----
>  tests/run_tests.sh                | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/overlay_overlay_nosugar.dts b/tests/overlay_overlay_nosugar.dts
> index b6d841b..b5947e9 100644
> --- a/tests/overlay_overlay_nosugar.dts
> +++ b/tests/overlay_overlay_nosugar.dts
> @@ -48,7 +48,7 @@
>  		};
>  	};
>  
> -	fragment@5 {
> +	fragment@4 {
>  		target = <&test>;
>  
>  		__overlay__ {
> @@ -58,7 +58,7 @@
>  		};
>  	};
>  
> -	fragment@6 {
> +	fragment@5 {
>  		target = <&test>;
>  
>  		__overlay__ {
> @@ -66,7 +66,7 @@
>  		};
>  	};
>  
> -	fragment@7 {
> +	fragment@6 {
>  		target = <&test>;
>  
>  		__overlay__ {
> @@ -74,7 +74,7 @@
>  		};
>  	};
>  
> -	fragment@8 {
> +	fragment@7 {
>  		target = <&test>;
>  
>  		__overlay__ {
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index 294585b..4b8dada 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -288,7 +288,7 @@ dtc_overlay_tests () {
>      run_test check_path overlay_overlay.test.dtb exists "/__local_fixups__"
>  
>      # Without syntactic sugar
> -    run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb "$SRCDIR/overlay_overlay.dts"
> +    run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb "$SRCDIR/overlay_overlay_nosugar.dts"
>      run_test check_path overlay_overlay_nosugar.test.dtb not-exists "/__symbols__"
>      run_test check_path overlay_overlay_nosugar.test.dtb exists "/__fixups__"
>      run_test check_path overlay_overlay_nosugar.test.dtb exists "/__local_fixups__"

-- 
David Gibson			| 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 --]