From: Marek Behún Date: Thu, 20 May 2021 11:23:54 +0000 (+0200) Subject: test/py: improve regular expression for ut subtest symbol matcher X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=6f243e25e6c81a8ab4e98b57fa5b749e0297cac3;p=u-boot.git test/py: improve regular expression for ut subtest symbol matcher Improve the regular expression that matches unittest symbols in u-boot.sym. Currently we do not enforce no prefix in symbol string, but with the soon to come change in linker lists declaring lists and entries with the __ADDRESSABLE macro (because of LTO), the symbol file will contain for every symbol of the form _u_boot_list_2_ut_X_2_Y also symbol __UNIQUE_ID___addressable__u_boot_list_2_ut_X_2_YN, (where N at the end is some number). In order to avoid matching these additional symbols, ensure that the character before "_u_boot_list_2_ut" is not a symbol name character. Signed-off-by: Marek Behún Reviewed-by: Simon Glass --- diff --git a/test/py/conftest.py b/test/py/conftest.py index 1b909cde9d..11a3f307ea 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -226,7 +226,7 @@ def pytest_configure(config): import u_boot_console_exec_attach console = u_boot_console_exec_attach.ConsoleExecAttach(log, ubconfig) -re_ut_test_list = re.compile(r'_u_boot_list_2_ut_(.*)_test_2_\1_test_(.*)\s*$') +re_ut_test_list = re.compile(r'[^a-zA-Z0-9_]_u_boot_list_2_ut_(.*)_test_2_\1_test_(.*)\s*$') def generate_ut_subtest(metafunc, fixture_name, sym_path): """Provide parametrization for a ut_subtest fixture.