From: Simon Glass Date: Wed, 12 Jul 2023 15:04:30 +0000 (-0600) Subject: test: Skip flat-tree tests if devicetree is not used X-Git-Tag: v2025.01-rc5-pxa1908~938^2~59 X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=6ec5178c0ef7c336ac41335aedc63f7f080a11a6;p=u-boot.git test: Skip flat-tree tests if devicetree is not used Many tests don't actually use the devicetree at all so there is no point in running the tests both with livetree and flat tree. Check for this and skip the flat tree test in that case. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/test/test-main.c b/test/test-main.c index 2a3b2ba364..778bf0a18a 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_LIVE_TREE) && + if ((test->flags & UT_TESTF_SCAN_FDT) && + !(test->flags & UT_TESTF_LIVE_TREE) && (CONFIG_IS_ENABLED(OFNODE_MULTI_TREE) || !(test->flags & UT_TESTF_OTHER_FDT)) && (!runs || ut_test_run_on_flattree(test)) &&