Skip to contentSkip to conversation

test: pr_cont_test.o depends on CONFIG_LOG=y

PATCH New Heinrich Schuchardt 2 participants 2 messages Jan 27, 2021 – Jan 30, 2021

lore
Share & tools
lore
#0 lore raw

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

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.

---
 test/log/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
test/log/Makefile +1 -1
index afdafa502a..3f09deb644 100644
@@ -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

#1 lore raw

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

Quoted 7 lines · Heinrich Schuchardt

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;

Quoted 7 lines

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/1fa3b4a3/attachment.sig>