michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: platforms: fix parsing testing metadata

Browse source 
Fix parsing of testing metadata, global defaults were being ignore in
some cases.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2025-02-09 11:54:15 -05:00 • committed by Benjamin Cabé
commit 7b8a5ed655
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/pylib/twister/twisterlib/platform.py
View file

@ -70,6 +70,7 @@ class Platform:
# if no flash size is specified by the board, take a default of 512K # if no flash size is specified by the board, take a default of 512K
self.flash = 512 self.flash = 512
self.supported = set() self.supported = set()
self.binaries = []
self.arch = None self.arch = None
self.vendor = "" self.vendor = ""
@ -114,15 +115,24 @@ class Platform:
# if no flash size is specified by the board, take a default of 512K # if no flash size is specified by the board, take a default of 512K
self.flash = variant_data.get("flash", data.get("flash", self.flash)) self.flash = variant_data.get("flash", data.get("flash", self.flash))
testing = variant_data.get("testing", data.get("testing", {})) testing = data.get("testing", {})
self.timeout_multiplier = testing.get("timeout_multiplier", self.timeout_multiplier) self.ignore_tags = testing.get("ignore_tags", [])
self.ignore_tags = testing.get("ignore_tags", self.ignore_tags) self.only_tags = testing.get("only_tags", [])
self.only_tags = testing.get("only_tags", self.only_tags)
self.default = testing.get("default", self.default) self.default = testing.get("default", self.default)
self.binaries = testing.get("binaries", []) self.binaries = testing.get("binaries", [])
self.timeout_multiplier = testing.get("timeout_multiplier", self.timeout_multiplier)
# testing data for variant
testing_var = variant_data.get("testing", data.get("testing", {}))
self.timeout_multiplier = testing_var.get("timeout_multiplier", self.timeout_multiplier)
self.ignore_tags = testing_var.get("ignore_tags", self.ignore_tags)
self.only_tags = testing_var.get("only_tags", self.only_tags)
self.default = testing_var.get("default", self.default)
self.binaries = testing_var.get("binaries", self.binaries)
renode = testing.get("renode", {}) renode = testing.get("renode", {})
self.uart = renode.get("uart", "") self.uart = renode.get("uart", "")
self.resc = renode.get("resc", "") self.resc = renode.get("resc", "")
self.supported = set() self.supported = set()
for supp_feature in variant_data.get("supported", data.get("supported", [])): for supp_feature in variant_data.get("supported", data.get("supported", [])):
for item in supp_feature.split(":"): for item in supp_feature.split(":"):