Skip to content

Commit

Permalink
sanitycheck: test on integration platforms on top of default platforms
Browse files Browse the repository at this point in the history
When running sanitycheck without any platform filters (-p option), we
take the default platforms and run on those only. When the -G options is
used for integration testing, the platforms listed as integration
platforms are not being added on top of default platforms.

This change adds integration platforms to the list an treats
integration_platforms as a positive filter, so that
integration_platforms are always being considered.

Fixes #29829

Signed-off-by: Anas Nashif <[email protected]>
  • Loading branch information
nashif authored and carlescufi committed Nov 17, 2020
1 parent 66332cc commit 87e3ec4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions scripts/sanity_chk/sanitylib.py
Original file line number Diff line number Diff line change
Expand Up @@ -2999,15 +2999,18 @@ def apply_filters(self, **kwargs):
self.add_instances(instance_list[:1])
else:
instances = list(filter(lambda tc: tc.platform.default, instance_list))
if self.integration:
instances += list(filter(lambda item: item.platform.name in tc.integration_platforms, \
instance_list))
self.add_instances(instances)

for instance in list(filter(lambda inst: not inst.platform.default, instance_list)):
for instance in list(filter(lambda inst: not inst.platform.default and \
not inst.platform.name in tc.integration_platforms, instance_list)):
discards[instance] = discards.get(instance, "Not a default test platform")
elif emulation_platforms:
self.add_instances(instance_list)
for instance in list(filter(lambda inst: not inst.platform.simulation != 'na', instance_list)):
discards[instance] = discards.get(instance, "Not an emulated platform")

else:
self.add_instances(instance_list)

Expand Down

0 comments on commit 87e3ec4

Please sign in to comment.