]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
test: Avoid a build error with SPL
authorSimon Glass <sjg@chromium.org>
Mon, 5 Jul 2021 22:32:43 +0000 (16:32 -0600)
committerSimon Glass <sjg@chromium.org>
Wed, 21 Jul 2021 16:27:34 +0000 (10:27 -0600)
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>
test/test-main.c

index 7afe8741cf90ba29ea42257e04df9f3b4a950c9f..3cdf6849c57ffd937c1877dee1b20339d60ac094 100644 (file)
@@ -45,7 +45,7 @@ static int dm_test_pre_run(struct unit_test_state *uts)
        uts->force_fail_alloc = false;
        uts->skip_post_probe = false;
        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));
        arch_reset_for_test();