commit f7005046ea00cf8169cfa23f939a84c7e6b8468a
author Simon Glass <sjg@chromium.org> Mon Jul 05 16:32:43 2021 -0600
committer Simon Glass <sjg@chromium.org> Wed Jul 21 10:27:34 2021 -0600
tree 233b9c2fafbee2f203304f6beeace476e5263dbe
parent 26974258e25b908779cfde73f5f15b1fb11453b6

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>

test/test-main.c

diff --git a/test/test-main.c b/test/test-main.c
index 7afe874..3cdf684 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -45,7 +45,7 @@
 	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();