Activate the CONFIG_CMD_LOG in sandbox to execute the LOG tests by default and correct the test log format after 72fa1ad8d9 ("log: Allow padding of the function name").
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---
configs/sandbox_defconfig | 2 +- test/py/tests/test_log.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 4f413582fb..a4aeee062f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -30,7 +30,6 @@ CONFIG_AUTOBOOT_STOP_STR_CRYPT="$5$rounds=640000$HrpE65IkB8CM5nCL$BKT3QdF98Bo8fJ CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_PRE_CONSOLE_BUFFER=y -CONFIG_LOG=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_F=y CONFIG_STACKPROTECTOR=y @@ -108,6 +107,7 @@ CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_SQUASHFS=y CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_LOG=y CONFIG_CMD_STACKPROTECTOR_TEST=y CONFIG_MAC_PARTITION=y CONFIG_AMIGA_PARTITION=y diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index 140dcb9aa2..20a3e56301 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -27,13 +27,13 @@ def test_log_format(u_boot_console):
cons = u_boot_console with cons.log.section('format'): - run_with_format('all', 'NOTICE.arch,file.c:123-func() msg') + run_with_format('all', 'NOTICE.arch,file.c:123- func() msg') output = cons.run_command('log format') assert output == 'Log format: clFLfm'
- run_with_format('fm', 'func() msg') - run_with_format('clfm', 'NOTICE.arch,func() msg') - run_with_format('FLfm', 'file.c:123-func() msg') + run_with_format('fm', ' func() msg') + run_with_format('clfm', 'NOTICE.arch, func() msg') + run_with_format('FLfm', 'file.c:123- func() msg') run_with_format('lm', 'NOTICE. msg') run_with_format('m', 'msg')