michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: handle auto defined ZEPHYR_<name>_MODULE settings in compliance

Browse source 
Update check_compliance to handle auto defined ZEPHYR_<name>_MODULE
Kconfig symbols.

check_compliance runs three levels of Kconfig check.
A basic and a full, both which uses the generated Kconfig.modules
created according to Zephyr modules present.

A Kconfig check where no Zephyr modules are sourced. This check ensures
that Zephyr Kconfig tree doesn't refer to Kconfig symbols defined in
Zephyr module's local Kconfig trees.

However, there are a few auto generated symbols which are allowed,
such as: `ZEPHYR_<name>_MODULE` and `ZEPHYR_<name>_MODULE_BLOBS`.

Therefore, when testing no blobs, filter the generated Kconfig.modules
file, so that no sourcing of extra Kconfig files are performed but
lines defining `ZEPHYR_<name>_MODULE` and `ZEPHYR_<name>_MODULE_BLOBS`
are preserved.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2024-08-23 14:40:34 +02:00 • committed by Anas Nashif
commit 35e28e6315
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/ci/check_compliance.py
View file

@ -383,11 +383,6 @@ class KconfigCheck(ComplianceTest):
This is needed to complete Kconfig sanity tests. This is needed to complete Kconfig sanity tests.
""" """
if self.no_modules:
with open(modules_file, 'w') as fp_module_file:
fp_module_file.write("# Empty\n")
return
# Invoke the script directly using the Python executable since this is # Invoke the script directly using the Python executable since this is
# not a module nor a pip-installed Python utility # not a module nor a pip-installed Python utility
zephyr_module_path = os.path.join(ZEPHYR_BASE, "scripts", zephyr_module_path = os.path.join(ZEPHYR_BASE, "scripts",
@ -415,6 +410,18 @@ class KconfigCheck(ComplianceTest):
)) ))
fp_module_file.write(content) fp_module_file.write(content)
if self.no_modules:
module_define_content = ""
module_definition = re.compile('config ZEPHYR_.*_MODULE.*').search
with open(modules_file, 'r+') as fp_module_file:
for line in fp_module_file:
if module_definition(line):
module_define_content += line
module_define_content += "\tbool\n"
fp_module_file.seek(0)
fp_module_file.write(module_define_content)
fp_module_file.truncate()
def get_module_setting_root(self, root, settings_file): def get_module_setting_root(self, root, settings_file):
""" """
Parse the Zephyr module generated settings file given by 'settings_file' Parse the Zephyr module generated settings file given by 'settings_file'