| Message ID | 20210127110946.53745-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 34d7f72a1db0226d083a131b565ed294eeae9c48 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] test: pr_cont_test.o depends on CONFIG_LOG=y | expand |
On Wed, Jan 27, 2021 at 12:09:46PM +0100, Heinrich Schuchardt wrote: > 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@rock-chips.com> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Applied to u-boot/master, thanks!
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
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@rock-chips.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- test/log/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2