twister: fix handling of mixed str/list configurations (76b91c70) · Commits · Wenxi XU / zephyr

We can now have situations like this when it comes to lists in Twister config: ```yaml common: platform_exclude: foo tests: my.test: platform_exclude: bar ``` ```yaml common: platform_exclude: foo tests: my.test: platform_exclude: - bar - baz ``` ```yaml common: platform_exclude: - foo - bar tests: my.test: platform_exclude: baz ``` ```yaml common: platform_exclude: - foo - bar tests: my.test: platform_exclude: - baz - bazz ``` This patch fixes handling of cases (2), (3) and (4). Signed-off-by:

Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

scripts/pylib/twister/twisterlib/config_parser.py

+9 −8

Changes for scripts/pylib/twister/twisterlib/config_parser.py: 9 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -184,20 +184,21 @@ class TwisterConfigParser:
		{"CONF_FILE", "OVERLAY_CONFIG", "DTC_OVERLAY_FILE"}, v
		)
		if k in d:
		if isinstance(d[k], str):
		# By default, we just concatenate string values of keys
		# which appear both in "common" and per-test sections,
		# but some keys are handled in adhoc way based on their
		# semantics.
		if k == "filter":
		d[k] = "(%s) and (%s)" % (d[k], v)
		else:
		elif k not in ("extra_conf_files", "extra_overlay_confs",
		"extra_dtc_overlay_files"):
		if isinstance(d[k], str) and isinstance(v, list):
		d[k] = d[k].split() + v
		elif isinstance(d[k], list) and isinstance(v, str):
		d[k] = d[v] + v.split()
		else:
		d[k] += v.split()
		elif isinstance(d[k], list) and isinstance(v, list):
		d[k] += v
		elif isinstance(d[k], str) and isinstance(v, str):
		d[k] += " " + v
		else:
		# replace value if not str/list (e.g. integer)
		d[k] = v
		else:
		d[k] = v

Admin message