LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Move do_autoprobe() 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:51 -07:00 committed by Tom Rini
parent d8ed234b29
commit 4b8b27e3d2
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/dm/test-dm.c
View File

@ -43,21 +43,6 @@ static int dm_test_init(struct unit_test_state *uts, bool of_live)
return 0; return 0;
} }
/* Ensure all the test devices are probed */
static int do_autoprobe(struct unit_test_state *uts)
{
struct udevice *dev;
int ret;
/* Scanning the uclass is enough to probe all the devices */
for (ret = uclass_first_device(UCLASS_TEST, &dev);
dev;
ret = uclass_next_device(&dev))
;
return ret;
}
static int dm_test_destroy(struct unit_test_state *uts) static int dm_test_destroy(struct unit_test_state *uts)
{ {
int id; int id;
@ -91,8 +76,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test,
uts->start = mallinfo(); uts->start = mallinfo();
if (test->flags & UT_TESTF_SCAN_PDATA) if (test->flags & UT_TESTF_SCAN_PDATA)
ut_assertok(dm_scan_plat(false)); ut_assertok(dm_scan_plat(false));
if (test->flags & UT_TESTF_PROBE_TEST)
ut_assertok(do_autoprobe(uts));
ut_assertok(test_pre_run(uts, test)); ut_assertok(test_pre_run(uts, test));

18
test/test-main.c
View File

@ -13,12 +13,30 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Ensure all the test devices are probed */
static int do_autoprobe(struct unit_test_state *uts)
{
struct udevice *dev;
int ret;
/* Scanning the uclass is enough to probe all the devices */
for (ret = uclass_first_device(UCLASS_TEST, &dev);
dev;
ret = uclass_next_device(&dev))
;
return ret;
}
int test_pre_run(struct unit_test_state *uts, struct unit_test *test) int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
{ {
/* DM tests have already done this */ /* DM tests have already done this */
if (!(test->flags & UT_TESTF_DM)) if (!(test->flags & UT_TESTF_DM))
uts->start = mallinfo(); uts->start = mallinfo();
if (test->flags & UT_TESTF_PROBE_TEST)
ut_assertok(do_autoprobe(uts));
if (!CONFIG_IS_ENABLED(OF_PLATDATA) && if (!CONFIG_IS_ENABLED(OF_PLATDATA) &&
(test->flags & UT_TESTF_SCAN_FDT)) (test->flags & UT_TESTF_SCAN_FDT))
ut_assertok(dm_extended_scan(false)); ut_assertok(dm_extended_scan(false));