diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-08 03:34:50 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-12 17:57:29 +0300 |
| commit | d8ed234b29d070b980a5335e72ebd26cb923ae66 (patch) | |
| tree | f9ad3d498e56aeef9a1d5c9df5bd2ee6efa7c3cd | |
| parent | 30a0d2064d593bf357282071a938816de876c64b (diff) | |
| download | u-boot-d8ed234b29d070b980a5335e72ebd26cb923ae66.tar.xz | |
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>
| -rw-r--r-- | test/dm/test-dm.c | 3 | ||||
| -rw-r--r-- | 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 69a0349d04..4cb0da13b7 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -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)); diff --git a/test/test-main.c b/test/test-main.c index 9c60009474..a971fe0e9c 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -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(); |