From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sat, 30 Jan 2021 20:32:20 -0700 Subject: [PATCH v2 12/40] test: Move dm_extended_scan() to test_pre_run() In-Reply-To: <20210131033248.1502385-1-sjg@chromium.org> References: <20210131033248.1502385-1-sjg@chromium.org> Message-ID: <20210131033248.1502385-13-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Move this step over to the pre-run function. Signed-off-by: Simon Glass --- (no changes since v1) test/dm/test-dm.c | 3 --- test/test-main.c | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index 3b1460327ad..3f9ce3d6fa8 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -92,9 +92,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, ut_assertok(dm_scan_plat(false)); if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts)); - if (!CONFIG_IS_ENABLED(OF_PLATDATA) && - (test->flags & UT_TESTF_SCAN_FDT)) - ut_assertok(dm_extended_scan(false)); ut_assertok(test_pre_run(uts, test)); diff --git a/test/test-main.c b/test/test-main.c index 9c600094740..a971fe0e9c8 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -6,7 +6,10 @@ #include #include +#include +#include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -16,6 +19,10 @@ int test_pre_run(struct unit_test_state *uts, struct unit_test *test) if (!(test->flags & UT_TESTF_DM)) uts->start = mallinfo(); + if (!CONFIG_IS_ENABLED(OF_PLATDATA) && + (test->flags & UT_TESTF_SCAN_FDT)) + ut_assertok(dm_extended_scan(false)); + if (test->flags & UT_TESTF_CONSOLE_REC) { int ret = console_record_reset_enable(); -- 2.30.0.365.g02bc693789-goog