adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 8

twister: deal with variants set on command line

Browse source 
not force host variant if environment is setting something different in
the case of posix arch.

Fixes #83766

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2025-01-09 21:37:42 -05:00
parent 3d42a1cfbc
commit 5769966d0f
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/pylib/twister/twisterlib/testplan.py
View file

@ -898,9 +898,14 @@ class TestPlan:
): ):
if itoolchain: if itoolchain:
toolchain = itoolchain toolchain = itoolchain
elif plat.arch in ['posix', 'unit']:
# workaround until toolchain variant in zephyr is overhauled and improved.
if self.env.toolchain in ['llvm']:
toolchain = 'llvm'
else:
toolchain = 'host'
else: else:
default_toolchain = "zephyr" if not self.env.toolchain else self.env.toolchain toolchain = "zephyr" if not self.env.toolchain else self.env.toolchain
toolchain = default_toolchain if plat.arch not in ['posix', 'unit'] else "host"
instance = TestInstance(ts, plat, toolchain, self.env.outdir) instance = TestInstance(ts, plat, toolchain, self.env.outdir)
instance.run = instance.check_runnable( instance.run = instance.check_runnable(