]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool.py: Fix parsing of bitbake-layers' output
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Tue, 31 May 2016 06:57:45 +0000 (01:57 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Jun 2016 07:10:04 +0000 (08:10 +0100)
Current parsing was picking wrong targets, leading to the following problem:

AssertionError: Command 'bitbake  Parsing recipes..done. -e' returned non-zero exit status 1:

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/selftest/devtool.py

index deb30906b7b3d2ade83438b5b01ebddc0c82e66c..0b305c893e28638893aedec40d7c2d61b481336b 100644 (file)
@@ -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<recipe>^[a-zA-Z0-9.-]+)(?P<colon>:$)', line)
+            if m:
+                testrecipes.append(m.group('recipe'))
         for testrecipe in testrecipes:
             # Check it's a valid recipe
             bitbake('%s -e' % testrecipe)