test: Avoid a build error with SPL
At present this fails to build chromeos_sandbox due to a rebase error in dm_test_pre_run(). Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
bf8188e4aa
commit
719d286475
@ -45,7 +45,7 @@ static int dm_test_pre_run(struct unit_test_state *uts)
|
|||||||
uts->force_fail_alloc = false;
|
uts->force_fail_alloc = false;
|
||||||
uts->skip_post_probe = false;
|
uts->skip_post_probe = false;
|
||||||
gd->dm_root = NULL;
|
gd->dm_root = NULL;
|
||||||
if (IS_ENABLED(CONFIG_UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA))
|
if (CONFIG_IS_ENABLED(UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA))
|
||||||
memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count));
|
memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count));
|
||||||
arch_reset_for_test();
|
arch_reset_for_test();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user