[PATCH 1/1] test: pr_cont_test.o depends on CONFIG_LOG=y

Heinrich Schuchardt xypron.glpk at gmx.de
Wed Jan 27 12:09:46 CET 2021


Compiling wandboard_defconfig with CONFIG_UT_LOG=y leads to a build error:

test/log/pr_cont_test.c: In function ‘log_test_pr_cont’:
test/log/pr_cont_test.c:28:14: error:
‘gd_t’ {aka ‘volatile struct global_data’} has no member named ‘log_fmt’
  log_fmt = gd->log_fmt;

We do not want to let CONFIG_UT_LOG depend on CONFIG_LOG=y because we have
tests for logging functions called with CONFIG_LOG=n.

Fix the build dependency.

Reported-by: Kever Yang <kever.yang at rock-chips.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 test/log/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/log/Makefile b/test/log/Makefile
index afdafa502a..3f09deb644 100644
--- a/test/log/Makefile
+++ b/test/log/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_CMD_LOG) += log_filter.o
 ifdef CONFIG_UT_LOG

 obj-y += test-main.o
-obj-y += pr_cont_test.o

 ifdef CONFIG_SANDBOX
 obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o
@@ -16,6 +15,7 @@ obj-$(CONFIG_LOG_SYSLOG) += syslog_test_ndebug.o
 endif

 ifdef CONFIG_LOG
+obj-y += pr_cont_test.o
 obj-$(CONFIG_CONSOLE_RECORD) += cont_test.o
 else
 obj-$(CONFIG_CONSOLE_RECORD) += nolog_test.o
--
2.29.2



More information about the U-Boot mailing list