libfdt: Fix sw_tree1 testcase

libfdt: Fix sw_tree1 testcase

[David Gibson]

There is a bug in the sw_tree1 testcase / utility which puts two
"compatible" properties in one node in the output tree.  This patch
fixes the bug, and also adds a new test checking that the sw_tree1
output is equal to test_tree1.dtb as its supposed to be, which should
catch future errors of this type.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Index: dtc/tests/run_tests.sh
===================================================================
--- dtc.orig/tests/run_tests.sh	2007-11-05 16:33:05.000000000 +1100
+++ dtc/tests/run_tests.sh	2007-11-05 16:33:37.000000000 +1100
@@ -71,6 +71,7 @@ libfdt_tests () {
     run_test sw_tree1
     tree1_tests sw_tree1.test.dtb
     tree1_tests unfinished_tree1.test.dtb
+    run_test dtbs_equal_ordered test_tree1.dtb sw_tree1.test.dtb
 
     # fdt_move tests
     for tree in test_tree1.dtb sw_tree1.test.dtb unfinished_tree1.test.dtb; do
@@ -112,6 +113,7 @@ libfdt_tests () {
     run_test rw_tree1
     tree1_tests rw_tree1.test.dtb
     tree1_tests_rw rw_tree1.test.dtb
+    run_test dtbs_equal_ordered test_tree1.dtb rw_tree1.test.dtb
 
     # Tests for behaviour on various sorts of corrupted trees
     run_test truncated_property
Index: dtc/tests/sw_tree1.c
===================================================================
--- dtc.orig/tests/sw_tree1.c	2007-11-05 16:33:57.000000000 +1100
+++ dtc/tests/sw_tree1.c	2007-11-05 16:34:03.000000000 +1100
@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
 	CHECK(fdt_begin_node(fdt, "subsubnode"));
 	CHECK(fdt_property(fdt, "compatible", "subsubnode1\0subsubnode",
 			   23));
-	CHECK(fdt_property_string(fdt, "compatible", "subsubnode1\0"));
 	CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1));
 	CHECK(fdt_end_node(fdt));
 	CHECK(fdt_end_node(fdt));

-- 
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

Re: libfdt: Fix sw_tree1 testcase

[Jon Loeliger]

So, like, the other day David Gibson mumbled:
> There is a bug in the sw_tree1 testcase / utility which puts two
> "compatible" properties in one node in the output tree.  This patch
> fixes the bug, and also adds a new test checking that the sw_tree1
> output is equal to test_tree1.dtb as its supposed to be, which should
> catch future errors of this type.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

This change appears to cause a test to fail.
I've not looked into it beyond "make check failed":

Thanks,
jdl

----------------------------------------------------------------

[ snip ]

nop_node rw_tree1.test.dtb:     PASS
setprop rw_tree1.test.dtb:      PASS
del_property rw_tree1.test.dtb: PASS
del_node rw_tree1.test.dtb:     PASS
dtbs_equal_ordered test_tree1.dtb rw_tree1.test.dtb:    FAIL    Property name mismatch "compatible" != "prop-str" at (8, 8)
truncated_property:     PASS
dtc.sh -I dts -O dtb -o dtc_tree1.test.dtb test_tree1.dts:      PASS
get_mem_rsv dtc_tree1.test.dtb: PASS
root_node dtc_tree1.test.dtb:   PASS

[ snip ]

del_node dtc_tree1.test.dtb:    PASS
dtbs_equal_ordered dtc_tree1.test.dtb test_tree1.dtb:   PASS
dtc.sh -I dts -O dtb -o dtc_escapes.test.dtb escapes.dts:       PASS
string_escapes dtc_escapes.test.dtb:    PASS
********** TEST SUMMARY
*     Total testcases:  1216
*                PASS:  1215
*                FAIL:  1
*   Bad configuration:  0
* Strange test result:  0
**********

Re: libfdt: Fix sw_tree1 testcase

[David Gibson]

On Mon, Nov 05, 2007 at 09:11:25AM -0600, Jon Loeliger wrote:
> So, like, the other day David Gibson mumbled:
> > There is a bug in the sw_tree1 testcase / utility which puts two
> > "compatible" properties in one node in the output tree.  This patch
> > fixes the bug, and also adds a new test checking that the sw_tree1
> > output is equal to test_tree1.dtb as its supposed to be, which should
> > catch future errors of this type.
> > 
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> 
> This change appears to cause a test to fail.
> I've not looked into it beyond "make check failed":

Crud, I screwed up and gave you an intermediate version of the patch
which tried to do the same thing for rw_tree1.  For that to work, I'll
need to write a dtbs_equal_notordered test.

Corrected version below.

libfdt: Fix sw_tree1 testcase

There is a bug in the sw_tree1 testcase / utility which puts two
"compatible" properties in one node in the output tree.  This patch
fixes the bug, and also adds a new test checking that the sw_tree1
output is equal to test_tree1.dtb as its supposed to be, which should
catch future errors of this type.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Index: dtc/tests/run_tests.sh
===================================================================
--- dtc.orig/tests/run_tests.sh	2007-11-06 10:38:21.000000000 +1100
+++ dtc/tests/run_tests.sh	2007-11-06 10:39:37.000000000 +1100
@@ -71,6 +71,7 @@
     run_test sw_tree1
     tree1_tests sw_tree1.test.dtb
     tree1_tests unfinished_tree1.test.dtb
+    run_test dtbs_equal_ordered test_tree1.dtb sw_tree1.test.dtb
 
     # fdt_move tests
     for tree in test_tree1.dtb sw_tree1.test.dtb unfinished_tree1.test.dtb; do
Index: dtc/tests/sw_tree1.c
===================================================================
--- dtc.orig/tests/sw_tree1.c	2007-11-05 16:59:13.000000000 +1100
+++ dtc/tests/sw_tree1.c	2007-11-06 10:39:37.000000000 +1100
@@ -64,7 +64,6 @@
 	CHECK(fdt_begin_node(fdt, "subsubnode"));
 	CHECK(fdt_property(fdt, "compatible", "subsubnode1\0subsubnode",
 			   23));
-	CHECK(fdt_property_string(fdt, "compatible", "subsubnode1\0"));
 	CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1));
 	CHECK(fdt_end_node(fdt));
 	CHECK(fdt_end_node(fdt));


-- 
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

Re: libfdt: Fix sw_tree1 testcase

[Jon Loeliger]

So, like, the other day David Gibson mumbled:
> Crud, I screwed up and gave you an intermediate version of the patch
> which tried to do the same thing for rw_tree1.  For that to work, I'll
> need to write a dtbs_equal_notordered test.
> 
> Corrected version below.
> 
> libfdt: Fix sw_tree1 testcase
> 
> There is a bug in the sw_tree1 testcase / utility which puts two
> "compatible" properties in one node in the output tree.  This patch
> fixes the bug, and also adds a new test checking that the sw_tree1
> output is equal to test_tree1.dtb as its supposed to be, which should
> catch future errors of this type.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Applied.

Thanks,
jdl