aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Anderson <sean.anderson@seco.com>2023-09-29 12:06:54 -0400
committerTom Rini <trini@konsulko.com>2023-10-09 14:40:09 -0400
commit55988e8cd03e207f2936ae0290b3ab9426903263 (patch)
treed0757e9cb36b3b8e494c3a87df389a41856d503f
parent8c0ba28cfbc3c265599d805b0df06334961b15e1 (diff)
downloadu-boot-WIP/2023-10-09-assorted-fixes.zip
u-boot-WIP/2023-10-09-assorted-fixes.tar.gz
u-boot-WIP/2023-10-09-assorted-fixes.tar.bz2
test: Fix SPL tests not being runWIP/2023-10-09-assorted-fixes
SPL doesn't have OF_LIVE enabled, so we can only run tests with a flat tree. Don't skip them even if they don't use the devicetree. Fixes: 6ec5178c0ef ("test: Skip flat-tree tests if devicetree is not used") Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--test/test-main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test-main.c b/test/test-main.c
index 778bf0a..edb20bc 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -476,7 +476,8 @@ static int ut_run_test_live_flat(struct unit_test_state *uts,
* (for sandbox we handle this by copying the tree, but not for other
* boards)
*/
- if ((test->flags & UT_TESTF_SCAN_FDT) &&
+ if ((!CONFIG_IS_ENABLED(OF_LIVE) ||
+ (test->flags & UT_TESTF_SCAN_FDT)) &&
!(test->flags & UT_TESTF_LIVE_TREE) &&
(CONFIG_IS_ENABLED(OFNODE_MULTI_TREE) ||
!(test->flags & UT_TESTF_OTHER_FDT)) &&