[PATCH 1/2] Selective .dtb deletion on make clean

[Jack Miller <jack-jZyo8ZIaZD9AfugRpC6u6w@public.gmane.org>]

Any .dtb generated by the tests is now suffixed with .test.dtb. The
.dtbs create by `make tests` are now explicitly named in the Makefile
cleanup list.

tl;dr make it possible to include a prebuilt .dtb in the tests directory
without make clean getting it.
---
 tests/Makefile.tests |  2 +-
 tests/run_tests.sh   | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 9adedec..05b1aa1 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -41,7 +41,7 @@ TESTS_TARGETS = $(TESTS) $(TESTS_TREES)
 TESTS_DEPFILES = $(TESTS:%=%.d) \
 	$(addprefix $(TESTS_PREFIX),testutils.d trees.d dumptrees.d)
 
-TESTS_CLEANFILES_L =  *.output vglog.* vgcore.* *.dtb *.test.dts *.dtsv1 tmp.*
+TESTS_CLEANFILES_L =  *.output vglog.* vgcore.* *test_tree1.dtb bad_node_format.dtb bad_node_char.dtb bad_prop_char.dtb *.test.dtb *.test.dts *.dtsv1 tmp.*
 TESTS_CLEANFILES_L += dumptrees
 TESTS_CLEANFILES = $(TESTS) $(TESTS_CLEANFILES_L:%=$(TESTS_PREFIX)%)
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index f94d361..68da4b5 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -263,8 +263,8 @@ libfdt_tests () {
 	tree1_tests_rw noppy.$basetree
     done
 
-    run_dtc_test -I dts -O dtb -o subnode_iterate.dtb subnode_iterate.dts
-    run_test subnode_iterate subnode_iterate.dtb
+    run_dtc_test -I dts -O dtb -o subnode_iterate.test.dtb subnode_iterate.dts
+    run_test subnode_iterate subnode_iterate.test.dtb
 
     # Tests for behaviour on various sorts of corrupted trees
     run_test truncated_property
@@ -308,8 +308,8 @@ dtc_tests () {
 
     run_test phandle_format dtc_references.test.dtb both
     for f in legacy epapr both; do
-	run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts
-	run_test phandle_format dtc_references.test.$f.dtb $f
+	run_dtc_test -I dts -O dtb -H $f -o dtc_references.$f.test.dtb references.dts
+	run_test phandle_format dtc_references.$f.test.dtb $f
     done
 
     run_dtc_test -I dts -O dtb -o multilabel.test.dtb multilabel.dts
@@ -322,9 +322,9 @@ dtc_tests () {
     run_test dtbs_equal_ordered dtc_comments.test.dtb dtc_comments-cmp.test.dtb
 
     # Check aliases support in fdt_path_offset
-    run_dtc_test -I dts -O dtb -o aliases.dtb aliases.dts
-    run_test get_alias aliases.dtb
-    run_test path_offset_aliases aliases.dtb
+    run_dtc_test -I dts -O dtb -o aliases.test.dtb aliases.dts
+    run_test get_alias aliases.test.dtb
+    run_test path_offset_aliases aliases.test.dtb
 
     # Check /include/ directive
     run_dtc_test -I dts -O dtb -o includes.test.dtb include0.dts
@@ -470,14 +470,14 @@ dtc_tests () {
     run_wrap_test cmp dependencies.test.d dependencies.cmp
 
     # Search paths
-    run_wrap_error_test $DTC -I dts -O dtb -o search_paths.dtb search_paths.dts
-    run_dtc_test -i search_dir -I dts -O dtb -o search_paths.dtb \
+    run_wrap_error_test $DTC -I dts -O dtb -o search_paths.test.dtb search_paths.dts
+    run_dtc_test -i search_dir -I dts -O dtb -o search_paths.test.dtb \
 	search_paths.dts
     run_wrap_error_test $DTC -i search_dir_b -I dts -O dtb \
-	-o search_paths_b.dtb search_paths_b.dts
+	-o search_paths_b.test.dtb search_paths_b.dts
     run_dtc_test -i search_dir_b -i search_dir -I dts -O dtb \
-	-o search_paths_b.dtb search_paths_b.dts
-    run_dtc_test -I dts -O dtb -o search_paths_subdir.dtb \
+	-o search_paths_b.test.dtb search_paths_b.dts
+    run_dtc_test -I dts -O dtb -o search_paths_subdir.test.dtb \
 	search_dir_b/search_paths_subdir.dts
 }
 
@@ -618,7 +618,7 @@ fdtdump_tests () {
     return
 
     local dts=fdtdump.dts
-    local dtb=fdtdump.dts.dtb
+    local dtb=fdtdump.dts.test.dtb
     local out=fdtdump.dts.out
     run_dtc_test -O dtb $dts -o ${dtb}
     $FDTDUMP ${dtb} | grep -v "//" >${out}
-- 
2.0.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html