From 76aefc4c1554e505bff4603244e2f95c9c66989d Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 31 May 2016 01:57:45 -0500 Subject: [PATCH] devtool.py: Fix parsing of bitbake-layers' output Current parsing was picking wrong targets, leading to the following problem: AssertionError: Command 'bitbake Parsing recipes..done. -e' returned non-zero exit status 1: (From OE-Core rev: eaf83a58825d91c7445835b27d843da7532c208b) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/devtool.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index deb30906b7..0b305c893e 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -467,12 +467,11 @@ class DevtoolTests(DevtoolBase): testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() # Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose result = runCmd('bitbake-layers show-recipes gcc-source*') - reading = False for line in result.output.splitlines(): - if line.startswith('=='): - reading = True - elif reading and not line.startswith(' '): - testrecipes.append(line.split(':')[0]) + # just match those lines that contain a real target + m = re.match('(?P^[a-zA-Z0-9.-]+)(?P:$)', line) + if m: + testrecipes.append(m.group('recipe')) for testrecipe in testrecipes: # Check it's a valid recipe bitbake('%s -e' % testrecipe)