[Backport v3.7-branch] twister: setup soc/arch roots based on module settings #77822
+19
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Get data for various roots from modules and do not hardcode location when retrieving list of boards in testplan. Fixes #71761 Signed-off-by: Anas Nashif <[email protected]> (cherry picked from commit d145db0)
zephyrbot
added
Backport
zephyrbot
requested review from
gchwier,
golowanow,
hakehuang,
KamilxPaszkiet,
LukaszMrugala,
nashif and
PerMac
gchwier
requested changes
Sep 2, 2024
| if soc_root: | ||
| self.soc_roots.append(os.path.join(module.project, soc_root)) | ||
| dts_root = module.meta.get("build", {}).get("settings", {}).get("dts_root") | ||
| if soc_root: |
There was a problem hiding this comment.
Suggested change
| if soc_root: | |
| if dts_root: |
rexut
suggested changes
Sep 9, 2024
| self.dts_roots.append(os.path.join(module.project, dts_root)) | ||
| arch_root = module.meta.get("build", {}).get("settings", {}).get("arch_root") | ||
| if arch_root: | ||
| self.arch_roots.append(os.path.join(module.project, arch_root)) |
There was a problem hiding this comment.
suggestion: append with path-like object (PEP 519):
Suggested change
| self.arch_roots.append(os.path.join(module.project, arch_root)) | |
| self.arch_roots.append(Path(os.path.join(module.project, arch_root))) |
OR:
Suggested change
| self.arch_roots.append(os.path.join(module.project, arch_root)) | |
| self.arch_roots.append(Path(module.project) / arch_root) |
otherwise following line will cause AttributeError: 'str' object has no attribute '_closed':
full traceback:
Traceback (most recent call last):
File "./zephyr/scripts/twister", line 215, in <module>
ret = main(options, default_options)
File "/.../workspace/zephyr/scripts/pylib/twister/twisterlib/twister_main.py", line 124, in main
tplan.discover()
File "/.../workspace/zephyr/scripts/pylib/twister/twisterlib/testplan.py", line 197, in discover
self.add_configurations()
File "/.../workspace/zephyr/scripts/pylib/twister/twisterlib/testplan.py", line 410, in add_configurations
v1_boards = list_boards.find_boards(lb_args)
File "/.../workspace/zephyr/scripts/list_boards.py", line 117, in find_boards
return sorted(itertools.chain(*find_arch2board_set(args).values()),
File "/.../workspace/zephyr/scripts/list_boards.py", line 122, in find_arch2board_set
arches = sorted(find_arches(args))
File "/.../workspace/zephyr/scripts/list_boards.py", line 138, in find_arches
for root in unique_paths(args.arch_roots):
File "/.../workspace/zephyr/scripts/list_hardware.py", line 182, in unique_paths
yield from dict.fromkeys(map(Path.resolve, paths)).keys()
File "/usr/lib/python3.8/pathlib.py", line 1179, in resolve
if self._closed:
| self.soc_roots.append(os.path.join(module.project, soc_root)) | ||
| dts_root = module.meta.get("build", {}).get("settings", {}).get("dts_root") | ||
| if soc_root: | ||
| self.dts_roots.append(os.path.join(module.project, dts_root)) |
There was a problem hiding this comment.
suggestion: see arch_roots below
Suggested change
| self.dts_roots.append(os.path.join(module.project, dts_root)) | |
| self.dts_roots.append(Path(os.path.join(module.project, dts_root))) |
OR:
Suggested change
| self.dts_roots.append(os.path.join(module.project, dts_root)) | |
| self.dts_roots.append(Path(module.project) / dts_root) |
| for module in modules: | ||
| soc_root = module.meta.get("build", {}).get("settings", {}).get("soc_root") | ||
| if soc_root: | ||
| self.soc_roots.append(os.path.join(module.project, soc_root)) |
There was a problem hiding this comment.
suggestion: see arch_roots below
Suggested change
| self.soc_roots.append(os.path.join(module.project, soc_root)) | |
| self.soc_roots.append(Path(os.path.join(module.project, soc_root))) |
OR:
Suggested change
| self.soc_roots.append(os.path.join(module.project, soc_root)) | |
| self.soc_roots.append(Path(module.project) / soc_root) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport d145db0 from #77163.