[gnome-continuous-yocto/gnomeostree-3.28-rocko: 619/8267] devtool.py: Fix parsing of bitbake-layers' output



commit 76aefc4c1554e505bff4603244e2f95c9c66989d
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Tue May 31 01:57:45 2016 -0500

    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 <leonardo sandoval gonzalez linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/devtool.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index deb3090..0b305c8 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<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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]