test: Move dm_extended_scan() to test_pre_run()

Move this step over to the pre-run function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-03-07 17:34:50 -07:00
committed by Tom Rini
parent 30a0d2064d
commit d8ed234b29
2 changed files with 7 additions and 3 deletions

View File

@@ -93,9 +93,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));

View File

@@ -6,7 +6,10 @@
#include <common.h>
#include <console.h>
#include <dm.h>
#include <dm/root.h>
#include <test/test.h>
#include <test/ut.h>
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();