michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: bugfix: Make elf scan more precise.

Browse source 
When scanning for available elfs, twister discards ones with `_pre`
in their name, to not include prebuilds like 'zephyr_pre0.elf`.
However, the scan looks at the whole test name. If _pre is in the name
(e.g. _precision) it would be wrongly discarded ending with twister
reporting error that no elfs were found. This commit makes the discard
to look only at the last part of the name (i.e. not including test name
but only a lowest level, where zephyr.elf etc are located.)

Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no>
This commit is contained in:
Maciej Perkowski 2023-01-03 17:11:23 +01:00 • committed by Anas Nashif
commit 474a8cf25f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/pylib/twister/twisterlib/testinstance.py
View file

@ -253,9 +253,9 @@ class TestInstance:
def get_elf_file(self) -> str: def get_elf_file(self) -> str:
fns = glob.glob(os.path.join(self.build_dir, "zephyr", "*.elf")) fns = glob.glob(os.path.join(self.build_dir, "zephyr", "*.elf"))
fns.extend(glob.glob(os.path.join(self.build_dir, "zephyr", "*.exe"))) fns.extend(glob.glob(os.path.join(self.build_dir, "zephyr", "*.exe")))
fns = [x for x in fns if '_pre' not in x] fns = [x for x in fns if '_pre' not in os.path.split(x)[-1]]
# EFI elf files # EFI elf files
fns = [x for x in fns if 'zefi' not in x] fns = [x for x in fns if 'zefi' not in os.path.split(x)[-1]]
if len(fns) != 1: if len(fns) != 1:
raise BuildError("Missing/multiple output ELF binary") raise BuildError("Missing/multiple output ELF binary")
return fns[0] return fns[0]