If the device tree changes during a test and we cannot restore it, mark
it as such so that future tests which need the live tree are skipped.
Signed-off-by: Simon Glass <s...@chromium.org>
---
include/asm-generic/global_data.h | 4 ++++
test/test-main.c | 19 ++++++++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/global_data.h
b/include/asm-generic/global_data.h
index 805a6fd6797..717cde129a9 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -635,6 +635,10 @@ enum gd_flags {
* @GD_FLG_SMP_READY: SMP initialization is complete
*/
GD_FLG_SMP_READY = 0x80000,
+ /*
+ * @GD_FLG_FDT_CHANGED: Device tree change has been detected by tests
+ */
+ GD_FLG_FDT_CHANGED = 0x100000,
};
#endif /* __ASSEMBLY__ */
diff --git a/test/test-main.c b/test/test-main.c
index 9dfa205faed..d285872d111 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -77,6 +77,10 @@ static int dm_test_pre_run(struct unit_test_state *uts)
{
bool of_live = uts->of_live;
+ if (of_live && (gd->flags & GD_FLG_FDT_CHANGED)) {
+ printf("Cannot run live tree test as device tree changed\n");
+ return -EFAULT;
+ }
uts->root = NULL;
uts->testdev = NULL;
uts->force_fail_alloc = false;
@@ -110,9 +114,17 @@ static int dm_test_post_run(struct unit_test_state *uts)
uint chksum;
chksum = crc8(0, gd->fdt_blob,
fdt_totalsize(gd->fdt_blob));
-
- if (chksum != uts->fdt_chksum)
+ if (chksum != uts->fdt_chksum) {
+ /*
+ * We cannot run any more tests that need the
+ * live tree, since its strings point into the
+ * flat tree, which has changed. This likely
+ * means that at least some of the pointers from
+ * the live tree point to different things
+ */
printf("Device tree changed: cannot run live
tree tests\n");
+ gd->flags |= GD_FLG_FDT_CHANGED;
+ }
break;
}
case FDTCHK_NONE:
@@ -411,7 +423,8 @@ static int ut_run_test_live_flat(struct unit_test_state
*uts,
* or it is a core test.
*/
if (!(test->flags & UT_TESTF_LIVE_TREE) &&
- (!runs || ut_test_run_on_flattree(test))) {
+ (!runs || ut_test_run_on_flattree(test)) &&
+ !(gd->flags & GD_FLG_FDT_CHANGED)) {
uts->of_live = false;
ut_assertok(ut_run_test(uts, test, test->name));
runs++;
--
2.37.2.672.g94769d06f0-goog
