On Thu, Jul 13, 2017 at 12:24:19AM +0300, Pantelis Antoniou wrote: > Add a stacked overlay unit test, piggybacking on fdtoverlay. > > Signed-off-by: Pantelis Antoniou <pantelis.antoniou@xxxxxxxxxxxx> Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> > --- > tests/run_tests.sh | 15 +++++++++++++++ > tests/stacked_overlay_bar.dts | 13 +++++++++++++ > tests/stacked_overlay_base.dts | 6 ++++++ > tests/stacked_overlay_baz.dts | 13 +++++++++++++ > 4 files changed, 47 insertions(+) > create mode 100644 tests/stacked_overlay_bar.dts > create mode 100644 tests/stacked_overlay_base.dts > create mode 100644 tests/stacked_overlay_baz.dts > > diff --git a/tests/run_tests.sh b/tests/run_tests.sh > index d20729c..cecc6d2 100755 > --- a/tests/run_tests.sh > +++ b/tests/run_tests.sh > @@ -791,6 +791,21 @@ fdtoverlay_tests() { > > # test that the new property is installed > run_fdtoverlay_test foobar "/test-node" "test-str-property" "-ts" ${basedtb} ${targetdtb} ${overlaydtb} > + > + stacked_base=stacked_overlay_base.dts > + stacked_basedtb=stacked_overlay_base.fdtoverlay.test.dtb > + stacked_bar=stacked_overlay_bar.dts > + stacked_bardtb=stacked_overlay_bar.fdtoverlay.test.dtb > + stacked_baz=stacked_overlay_baz.dts > + stacked_bazdtb=stacked_overlay_baz.fdtoverlay.test.dtb > + stacked_targetdtb=stacked_overlay_target.fdoverlay.test.dtb > + > + run_dtc_test -@ -I dts -O dtb -o $stacked_basedtb $stacked_base > + run_dtc_test -@ -I dts -O dtb -o $stacked_bardtb $stacked_bar > + run_dtc_test -@ -I dts -O dtb -o $stacked_bazdtb $stacked_baz > + > + # test that baz correctly inserted the property > + run_fdtoverlay_test baz "/foonode/barnode/baznode" "baz-property" "-ts" ${stacked_basedtb} ${stacked_targetdtb} ${stacked_bardtb} ${stacked_bazdtb} > } > > pylibfdt_tests () { > diff --git a/tests/stacked_overlay_bar.dts b/tests/stacked_overlay_bar.dts > new file mode 100644 > index 0000000..c646399 > --- /dev/null > +++ b/tests/stacked_overlay_bar.dts > @@ -0,0 +1,13 @@ > +/dts-v1/; > +/plugin/; > +/ { > + fragment@1 { > + target = <&foo>; > + __overlay__ { > + overlay-1-property; > + bar: barnode { > + bar-property = "bar"; > + }; > + }; > + }; > +}; > diff --git a/tests/stacked_overlay_base.dts b/tests/stacked_overlay_base.dts > new file mode 100644 > index 0000000..2916423 > --- /dev/null > +++ b/tests/stacked_overlay_base.dts > @@ -0,0 +1,6 @@ > +/dts-v1/; > +/ { > + foo: foonode { > + foo-property = "foo"; > + }; > +}; > diff --git a/tests/stacked_overlay_baz.dts b/tests/stacked_overlay_baz.dts > new file mode 100644 > index 0000000..a52f0cc > --- /dev/null > +++ b/tests/stacked_overlay_baz.dts > @@ -0,0 +1,13 @@ > +/dts-v1/; > +/plugin/; > +/ { > + fragment@1 { > + target = <&bar>; > + __overlay__ { > + overlay-2-property; > + baz: baznode { > + baz-property = "baz"; > + }; > + }; > + }; > +}; -- 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:
signature.asc
Description: PGP signature