From: Simon Glass <sjg@chromium.org>
Date: Sun, 23 Jun 2024 20:30:28 +0000 (-0600)
Subject: log: Allow tests to pass with CONFIG_LOGF_FUNC_PAD set
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1956785bf270036c8fa54f965924d65dcd02fd3f;p=u-boot.git

log: Allow tests to pass with CONFIG_LOGF_FUNC_PAD set

This setting pads out the function names. Adjust the test to handle
this, since some boards use it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py
index 140dcb9aa2..79808674bb 100644
--- a/test/py/tests/test_log.py
+++ b/test/py/tests/test_log.py
@@ -27,13 +27,16 @@ 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')
+        pad = int(u_boot_console.config.buildconfig.get('config_logf_func_pad'))
+        padding = ' ' * (pad - len('func'))
+
+        run_with_format('all', f'NOTICE.arch,file.c:123-{padding}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', f'{padding}func() msg')
+        run_with_format('clfm', f'NOTICE.arch,{padding}func() msg')
+        run_with_format('FLfm', f'file.c:123-{padding}func() msg')
         run_with_format('lm', 'NOTICE. msg')
         run_with_format('m', 'msg')