dtc: Extend and better test dtbs_equal utility programs
The dtbs_equal_ordered test program is used to implement a number of testcases. However, the test program itself has never been particularly well tested. In addition there are testcases coming in future for which it would be useful to have a corresponding "dtbs_equal_unordered" which checks for equality of device trees, not considering the internal ordering of elements. Finally, for some tests we may want it would be useful to check trees for equality with the PASS case being when they are *not* equal.
This patch addresses all of the above. A dtbs_equal_unordered is added, and both it and the existing dtbs_equal_ordered program now take a -n option to make the PASS case be where the trees are not equal. A number of example trees with slight modifications from test_tree1 are used to verify that both these programs correctly identify when the tree is altered, and a dtb_reverse program is used to verify that the unordered version does not depend on internal ordering. These new testcases for the equality testing programs are split out into a new test group in run_tests.sh.
dtbs_equal_unordered uses the new property iteration functions, and so this also acts as further testing for those functions. dtbs_equal_unordered will be useful for further testing the recently added tree-merging code and its upcoming extensions.
Signed-off-by David Gibson <[email protected]>
tests/dtb_reverse.c new file +164 -0
@@ -0,0 +1,164 @@ +/* +* libfdt - Flat Device Tree manipulation +* Tests if two given dtbs are structurally equal (including order) +* Copyright (C) 2010 David Gibson, IBM Corporation. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdint.h> +#include <limits.h> + +#include <fdt.h> +#include <libfdt.h> + +#include "tests.h" +#include "testdata.h" + +#define CHECK (code) \ + { \ + err = (code); \ + if (err) \ + FAIL(#code ": %s", fdt_strerror(err)); \ + } + +static void reverse_reservemap (void *in,void *out,int n) +{ +int err; +uint64_t addr, size; + +verbose_printf ("reverse_reservemap(): %d/%d\n" , + n,fdt_num_mem_rsv (in)); + +if (n < (fdt_num_mem_rsv (in)-1 )) +reverse_reservemap (in, out, n+1 ); + +CHECK (fdt_get_mem_rsv (in, n, &addr, &size)); +CHECK (fdt_add_reservemap_entry (out, addr, size)); +verbose_printf ("Added entry 0x%llx 0x%llx\n" , + (unsigned long long )addr, (unsigned long long )size); +} + +static void reverse_properties (void *in,void *out,int offset) +{ +int err; +int len; +const char *name; +const void *data; + + data =fdt_getprop_by_offset (in, offset, &name, &len); +if (!data) +FAIL ("fdt_getprop_by_offset(): %s\n" ,fdt_strerror (len)); + +verbose_printf ("reverse_properties(): offset=%d name=%s\n" , + offset, name); + + offset =fdt_next_property_offset (in, offset); +if (offset >=0 ) +reverse_properties (in, out, offset); +else if (offset != -FDT_ERR_NOTFOUND ) +FAIL ("fdt_next_property_offset(): %s\n" ,fdt_strerror (offset)); + +CHECK (fdt_property (out, name, data, len)); +verbose_printf (" -> output property %s\n" , name); +} + +static void reverse_node (void *in,void *out,int nodeoffset); + +static void reverse_children (void *in,void *out,int offset) +{ +int err; +int nextoffset = offset; +int depth =1 ; + +do { +char path[PATH_MAX ]; + +CHECK (fdt_get_path (in, nextoffset, path,sizeof (path))); +verbose_printf ("reverse_children() offset=%d nextoffset=%d [%s]" +" depth=%d\n" , offset, nextoffset, path, depth); + + nextoffset =fdt_next_node (in, nextoffset, &depth); + }while ((depth >=0 ) && (depth !=1 )); + +if (depth ==1 ) +reverse_children (in, out, nextoffset); + +reverse_node (in, out, offset); +} + +static void reverse_node (void *in,void *out,int nodeoffset) +{ +const char *name =fdt_get_name (in, nodeoffset,NULL ); +char path[PATH_MAX ]; +int err; +int offset; +int depth =0 ; + +CHECK (fdt_get_path (in, nodeoffset, path,sizeof (path))); +verbose_printf ("reverse_node(): nodeoffset=%d [%s]\n" , + nodeoffset, path); + +CHECK (fdt_begin_node (out, name)); + + offset =fdt_first_property_offset (in, nodeoffset); +if (offset >=0 ) +reverse_properties (in, out, offset); +else if (offset != -FDT_ERR_NOTFOUND ) +FAIL ("fdt_first_property(): %s\n" ,fdt_strerror (offset)); + + offset =fdt_next_node (in, nodeoffset, &depth); + +if (depth ==1 ) +reverse_children (in, out, offset); + +CHECK (fdt_end_node (out)); +} + +int main (int argc,char *argv[]) +{ +void *in, *out; +char outname[PATH_MAX ]; +int bufsize; +int err; + +test_init (argc, argv); +if (argc !=2 ) +CONFIG ("Usage: %s <dtb file>" , argv[0 ]); + + in =load_blob (argv[1 ]); +sprintf (outname,"%s.reversed.test.dtb" , argv[1 ]); + + bufsize =fdt_totalsize (in); + out =xmalloc (bufsize); + +CHECK (fdt_create (out, bufsize)); + +fdt_set_boot_cpuid_phys (out,fdt_boot_cpuid_phys (in)); + +reverse_reservemap (in, out,0 ); +CHECK (fdt_finish_reservemap (out)); + +reverse_node (in, out,0 ); + +CHECK (fdt_finish (out)); + +save_blob (outname, out); + +PASS (); +}
tests/dtbs_equal_unordered.c new file +224 -0
224 lines not on this page · raw message
tests/Makefile.tests +1 -0
@@ -14,6 +14,7 @@ LIB_TESTS_L = get_mem_rsv \ boot-cpuid incbin \ extra-terminating-null \ dtbs_equal_ordered \ + dtb_reverse dtbs_equal_unordered \ add_subnode_with_nops path_offset_aliases LIB_TESTS = $(LIB_TESTS_L:%=$(TESTS_PREFIX)%)
tests/run_tests.sh +36 -1
@@ -344,6 +344,38 @@ dtc_tests () { run_sh_test dtc-fatal.sh -I fs -O dtb nosuchfile } +cmp_tests () { + basetree="$1" + shift + wrongtrees="$@" + + run_test dtb_reverse $basetree + + # First dtbs_equal_ordered + run_test dtbs_equal_ordered $basetree $basetree + run_test dtbs_equal_ordered -n $basetree $basetree.reversed.test.dtb + for tree in $wrongtrees; do + run_test dtbs_equal_ordered -n $basetree $tree + done + + # now unordered + run_test dtbs_equal_unordered $basetree $basetree + run_test dtbs_equal_unordered $basetree $basetree.reversed.test.dtb + run_test dtbs_equal_unordered $basetree.reversed.test.dtb $basetree + for tree in $wrongtrees; do + run_test dtbs_equal_unordered -n $basetree $tree + done +} + +dtbs_equal_tests () { + WRONG_TREE1="" + for x in 1 2 3 4 5 6 7 8 9; do + run_dtc_test -I dts -O dtb -o test_tree1_wrong$x.test.dtb test_tree1_wrong$x.dts + WRONG_TREE1="$WRONG_TREE1 test_tree1_wrong$x.test.dtb" + done + cmp_tests test_tree1.dtb $WRONG_TREE1 +} + while getopts "vt:m" ARG ; do case $ARG in "v")
@@ -359,7 +391,7 @@ while getopts "vt:m" ARG ; do done if [ -z "$TESTSETS" ]; then - TESTSETS="libfdt dtc" + TESTSETS="libfdt dtc dtbs_equal" fi # Make sure we don't have stale blobs lying around
@@ -373,6 +405,9 @@ for set in $TESTSETS; do "dtc") dtc_tests ;; + "dtbs_equal") + dtbs_equal_tests + ;; esac done
tests/dtbs_equal_ordered.c +56 -31
136 lines not on this page · raw message
tests/test_tree1_wrong1.dts new file +36 -0
@@ -0,0 +1,36 @@ +/dts-v1/; + +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong2.dts new file +36 -0
@@ -0,0 +1,36 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong3.dts new file +36 -0
@@ -0,0 +1,36 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong4.dts new file +34 -0
@@ -0,0 +1,34 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + }; +};
tests/test_tree1_wrong5.dts new file +37 -0
@@ -0,0 +1,37 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbefe>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong6.dts new file +38 -0
@@ -0,0 +1,38 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + extra-prop; + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong7.dts new file +39 -0
@@ -0,0 +1,39 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + extranode { + }; + }; + }; +};
tests/test_tree1_wrong8.dts new file +37 -0
@@ -0,0 +1,37 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010001; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
tests/test_tree1_wrong9.dts new file +38 -0
@@ -0,0 +1,38 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; +/memreserve/ 0 1; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + subsubnode@0 { + phandle = <0x2001>; + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; + }; + + ss2 { + }; + }; +};
Signature · 4 lines
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