commit ba765b273f0f89dd0a2ffb74b96f08d117ce2915
author David Gibson <david@gibson.dropbear.id.au> Fri Dec 09 16:02:46 2016 +1100
committer David Gibson <david@gibson.dropbear.id.au> Fri Dec 09 16:13:37 2016 +1100
tree 263230a49127c1ff68a9290577760ae989826b9a
parent 6ea8cd944fcd09dfbda672c6bf6205ec8a5fc152

tests: Clarify dtc overlay tests

This changes the names of the testfiles for a number of the testcases of
the dtc overlay generation functionality to make them shorter and a bit
cleaerer what's going on.  In addition we move some of the check_path
sanity checks closer to the dtc commands they verify.

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

tests/overlay_overlay.dts

diff --git a/tests/overlay_overlay_dtc.dts b/tests/overlay_overlay.dts
similarity index 100%
rename from tests/overlay_overlay_dtc.dts
rename to tests/overlay_overlay.dts

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 8ac46e6..660e842 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -208,22 +208,25 @@
 # Tests to exercise dtc's overlay generation support
 dtc_overlay_tests () {
     # Overlay tests for dtc
-    run_dtc_test -@ -I dts -O dtb -o overlay_base_with_symbols.test.dtb overlay_base.dts
-    run_dtc_test -@ -I dts -O dtb -o overlay_overlay_with_symbols.test.dtb overlay_overlay_dtc.dts
-    run_test overlay overlay_base_with_symbols.test.dtb overlay_overlay_with_symbols.test.dtb
+    run_dtc_test -@ -I dts -O dtb -o overlay_base.test.dtb overlay_base.dts
+    run_test check_path overlay_base.test.dtb exists "/__symbols__"
+    run_test check_path overlay_base.test.dtb not-exists "/__fixups__"
+    run_test check_path overlay_base.test.dtb not-exists "/__local_fixups__"
 
-    # Test symbols/fixups existence
-    run_test check_path overlay_overlay_with_symbols.test.dtb exists "/__symbols__"
-    run_test check_path overlay_overlay_with_symbols.test.dtb exists "/__fixups__"
-    run_test check_path overlay_overlay_with_symbols.test.dtb exists "/__local_fixups__"
+    run_dtc_test -@ -I dts -O dtb -o overlay_overlay.test.dtb overlay_overlay.dts
+    run_test check_path overlay_overlay.test.dtb exists "/__symbols__"
+    run_test check_path overlay_overlay.test.dtb exists "/__fixups__"
+    run_test check_path overlay_overlay.test.dtb exists "/__local_fixups__"
+
+    run_test overlay overlay_base.test.dtb overlay_overlay.test.dtb
 
     # test plugin source to dtb and back
-    run_dtc_test -@ -I dtb -O dts -o overlay_overlay_dtc.test.dts overlay_overlay_with_symbols.test.dtb
-    run_dtc_test -@ -I dts -O dtb -o overlay_overlay_with_symbols.test.test.dtb overlay_overlay_dtc.test.dts
-    run_test dtbs_equal_ordered overlay_overlay_with_symbols.test.dtb overlay_overlay_with_symbols.test.test.dtb
+    run_dtc_test -@ -I dtb -O dts -o overlay_overlay_decompile.test.dts overlay_overlay.test.dtb
+    run_dtc_test -@ -I dts -O dtb -o overlay_overlay_decompile.test.dtb overlay_overlay_decompile.test.dts
+    run_test dtbs_equal_ordered overlay_overlay.test.dtb overlay_overlay_decompile.test.dtb
 
     # test plugin auto-generation without using -@
-    run_dtc_test -I dts -O dtb -o overlay_overlay_with_symbols_auto.test.dtb overlay_overlay_dtc.dts
+    run_dtc_test -I dts -O dtb -o overlay_overlay_with_symbols_auto.test.dtb overlay_overlay.dts
     run_test check_path overlay_overlay_with_symbols_auto.test.dtb exists "/__symbols__"
     run_test check_path overlay_overlay_with_symbols_auto.test.dtb exists "/__fixups__"
     run_test check_path overlay_overlay_with_symbols_auto.test.dtb exists "/__local_fixups__"