michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: twisterlib: Modify the overlay regular expression

Browse source 
Modify the regex used to merge overlays specified for
test samples in twister tests.
Overlays without any prefixes will be merged and passed to cmake.
Overlays with prefixes won't be merged but passed to cmake as they are.

Signed-off-by: Piotr Węgliński <piotr.weglinski@nordicsemi.no>
This commit is contained in:
Piotr Węgliński 2022-10-04 14:58:26 +02:00 • committed by Anas Nashif
commit 08eb361846
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -783,8 +783,9 @@ class ProjectBuilder(FilterBuilder):
args += instance.handler.args
# merge overlay files into one variable
# overlays with prefixes won't be merged but pass to cmake as they are
def extract_overlays(args):
re_overlay = re.compile('OVERLAY_CONFIG=(.*)')
re_overlay = re.compile(r'^\s*OVERLAY_CONFIG=(.*)')
other_args = []
overlays = []
for arg in args: