michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: support testing multiple toolchain variants

Browse source 
Added integration_toolchains to allow building/testing with multiple
toolchains available in the environment.

This changes the output structure and adds another level in the path
under twister_out signifying the toolchain used. The toolchain used
(variant) is also part of the json output now.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2024-12-05 10:16:03 -05:00 • committed by Benjamin Cabé
commit 11e656bb6a
19 changed files with 167 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

29
scripts/pylib/twister/twisterlib/runner.py
View file

@ -658,6 +658,9 @@ class CMake:
'-DCONFIG_COVERAGE=y'
])
if self.instance.toolchain:
cmake_args.append(f'-DZEPHYR_TOOLCHAIN_VARIANT={self.instance.toolchain}')
# If needed, run CMake using the package_helper script first, to only run
# a subset of all cmake modules. This output will be used to filter
# testcases, and the full CMake configuration will be run for
@ -830,7 +833,13 @@ class FilterBuilder(CMake):
and self.env.options.west_flash is None
):
logger.warning("Sysbuild test will be skipped. West must be used for flashing.")
return {os.path.join(self.platform.name, self.testsuite.name): True}
return {
os.path.join(
self.platform.name,
self.instance.toolchain,
self.testsuite.name
): True
}
if self.testsuite and self.testsuite.filter:
try:
@ -846,9 +855,21 @@ class FilterBuilder(CMake):
raise se
if not ret:
return {os.path.join(self.platform.name, self.testsuite.name): True}
return {
os.path.join(
self.platform.name,
self.instance.toolchain,
self.testsuite.name
): True
}
else:
return {os.path.join(self.platform.name, self.testsuite.name): False}
return {
os.path.join(
self.platform.name,
self.instance.toolchain,
self.testsuite.name
): False
}
else:
self.platform.filter_data = filter_data
return filter_data
@ -1548,6 +1569,8 @@ class ProjectBuilder(FilterBuilder):
and hasattr(self.instance.handler, 'seed')
and self.instance.handler.seed is not None ):
more_info += "/seed: " + str(self.options.seed)
if instance.toolchain:
more_info += f" <{instance.toolchain}>"
logger.info(
f"{results.done - results.filtered_static:>{total_tests_width}}/{total_to_do}"
f" {instance.platform.name:<25} {instance.testsuite.name:<50}"