michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: handle quotes for configuration options

Browse source 
Add support handling quotes for configuration options in extra args by
escaping them properly instead of removing the quotes altogether. For
other options in extra_args quotes are removes as usual.

Add similar support in west build command also.

Add a unit test to check this functionality.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
This commit is contained in:
Chaitanya Tata 2023-09-05 01:47:48 +05:30 • committed by Anas Nashif
commit 6b05af6e43
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/pylib/twister/twisterlib/runner.py
View file

@ -978,9 +978,15 @@ class ProjectBuilder(FilterBuilder):
sys.stdout.flush() sys.stdout.flush()
@staticmethod @staticmethod
def cmake_assemble_args(args, handler, extra_conf_files, extra_overlay_confs, def cmake_assemble_args(extra_args, handler, extra_conf_files, extra_overlay_confs,
extra_dtc_overlay_files, cmake_extra_args, extra_dtc_overlay_files, cmake_extra_args,
build_dir): build_dir):
# Retain quotes around config options
config_options = [arg for arg in extra_args if arg.startswith("CONFIG_")]
args = [arg for arg in extra_args if not arg.startswith("CONFIG_")]
args_expanded = ["-D{}".format(a.replace('"', '\"')) for a in config_options]
if handler.ready: if handler.ready:
args.extend(handler.args) args.extend(handler.args)
@ -1003,7 +1009,7 @@ class ProjectBuilder(FilterBuilder):
args.append("OVERLAY_CONFIG=\"%s\"" % (" ".join(overlays))) args.append("OVERLAY_CONFIG=\"%s\"" % (" ".join(overlays)))
# Build the final argument list # Build the final argument list
args_expanded = ["-D{}".format(a.replace('"', '\"')) for a in cmake_extra_args] args_expanded.extend(["-D{}".format(a.replace('"', '\"')) for a in cmake_extra_args])
args_expanded.extend(["-D{}".format(a.replace('"', '')) for a in args]) args_expanded.extend(["-D{}".format(a.replace('"', '')) for a in args])
return args_expanded return args_expanded

5
scripts/tests/twister/test_runner.py
View file

@ -90,7 +90,7 @@ def test_projectbuilder_cmake_assemble_args(m):
handler.ready = True handler.ready = True
assert(ProjectBuilder.cmake_assemble_args( assert(ProjectBuilder.cmake_assemble_args(
["basearg1"], ["basearg1", "CONFIG_t=\"test\"", "SNIPPET_t=\"test\""],
handler, handler,
["a.conf;b.conf", "c.conf"], ["a.conf;b.conf", "c.conf"],
["extra_overlay.conf"], ["extra_overlay.conf"],
@ -98,8 +98,9 @@ def test_projectbuilder_cmake_assemble_args(m):
["cmake1=foo", "cmake2=bar"], ["cmake1=foo", "cmake2=bar"],
"/builddir/", "/builddir/",
) == [ ) == [
"-DCONFIG_t=\"test\"",
"-Dcmake1=foo", "-Dcmake2=bar", "-Dcmake1=foo", "-Dcmake2=bar",
"-Dbasearg1", "-Dbasearg1", "-DSNIPPET_t=test",
"-Dhandler_arg1", "-Dhandler_arg2", "-Dhandler_arg1", "-Dhandler_arg2",
"-DCONF_FILE=a.conf;b.conf;c.conf", "-DCONF_FILE=a.conf;b.conf;c.conf",
"-DDTC_OVERLAY_FILE=x.overlay;y.overlay;z.overlay", "-DDTC_OVERLAY_FILE=x.overlay;y.overlay;z.overlay",

6
scripts/west_commands/build.py
View file

@ -317,7 +317,11 @@ class Build(Forceable):
if data == 'extra_configs': if data == 'extra_configs':
args = ["-D{}".format(arg.replace('"', '\"')) for arg in arg_list] args = ["-D{}".format(arg.replace('"', '\"')) for arg in arg_list]
elif data == 'extra_args': elif data == 'extra_args':
args = ["-D{}".format(arg.replace('"', '')) for arg in arg_list] # Retain quotes around config options
config_options = [arg for arg in arg_list if arg.startswith("CONFIG_")]
non_config_options = [arg for arg in arg_list if not arg.startswith("CONFIG_")]
args = ["-D{}".format(a.replace('"', '\"')) for a in config_options]
args.extend(["-D{}".format(arg.replace('"', '')) for arg in non_config_options])
elif data == 'extra_conf_files': elif data == 'extra_conf_files':
extra_conf_files.extend(arg_list) extra_conf_files.extend(arg_list)
continue continue