twister: filters: fix processing of platform scope (173468ca) · Commits · Wenxi XU / zephyr

scripts/pylib/twister/twisterlib/testplan.py

+22 −19

Changes for scripts/pylib/twister/twisterlib/testplan.py: 22 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -733,7 +733,7 @@ class TestPlan:
		logger.info("Selecting default platforms per testsuite scenario")
		default_platforms = True
		elif emu_filter:
		logger.info("Selecting emulation platforms per testsuite scenraio")
		logger.info("Selecting emulation platforms per testsuite scenario")
		emulation_platforms = True
		elif vendor_filter:
		vendor_platforms = True
		@@ -767,32 +767,35 @@ class TestPlan:
		platforms = self.platforms

		platform_config = self.test_config.get('platforms', {})
		# test configuration options
		test_config_options = self.test_config.get('options', {})
		integration_mode_list = test_config_options.get('integration_mode', [])

		logger.info("Building initial testsuite list...")

		keyed_tests = {}

		for _, ts in self.testsuites.items():
		if (
		ts.build_on_all
		and not platform_filter
		and platform_config.get('increased_platform_scope', True)
		):
		platform_scope = self.platforms
		elif ts.integration_platforms:
		integration_platforms = list(
		if ts.integration_platforms:
		_integration_platforms = list(
		filter(lambda item: item.name in ts.integration_platforms, self.platforms)
		)
		if self.options.integration:
		platform_scope = integration_platforms
		else:
		platform_scope = platforms
		if not platform_filter:
		tco = self.test_config.get('options', {})
		im = tco.get('integration_mode', [])
		if any(ts.id.startswith(i) for i in im):
		platform_scope = integration_platforms
		_integration_platforms = []

		if (ts.build_on_all and not platform_filter and
		platform_config.get('increased_platform_scope', True)):
		# if build_on_all is set, we build on all platforms
		platform_scope = self.platforms
		elif ts.integration_platforms and self.options.integration:
		# if integration is set, we build on integration platforms
		platform_scope = _integration_platforms
		elif ts.integration_platforms and not platform_filter:
		# if integration platforms are set, we build on those and integration mode is set
		# for this test suite, we build on integration platforms
		if any(ts.id.startswith(i) for i in integration_mode_list):
		platform_scope = _integration_platforms
		else:
		platform_scope += integration_platforms
		platform_scope = platforms + _integration_platforms
		else:
		platform_scope = platforms

Admin message