diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-05-31 01:57:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:02 +0100 |
commit | 76aefc4c1554e505bff4603244e2f95c9c66989d (patch) | |
tree | 16f1fdd75712d3fe4d1aa4f1d1be26e8afa82b9c /meta/lib/oeqa | |
parent | e2e3fa4259840fa8d7738ab46e984062c7f65bb8 (diff) | |
download | poky-76aefc4c1554e505bff4603244e2f95c9c66989d.tar.gz |
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>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | 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 deb30906b7..0b305c893e 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py | |||
@@ -467,12 +467,11 @@ class DevtoolTests(DevtoolBase): | |||
467 | testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() | 467 | testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() |
468 | # Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose | 468 | # Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose |
469 | result = runCmd('bitbake-layers show-recipes gcc-source*') | 469 | result = runCmd('bitbake-layers show-recipes gcc-source*') |
470 | reading = False | ||
471 | for line in result.output.splitlines(): | 470 | for line in result.output.splitlines(): |
472 | if line.startswith('=='): | 471 | # just match those lines that contain a real target |
473 | reading = True | 472 | m = re.match('(?P<recipe>^[a-zA-Z0-9.-]+)(?P<colon>:$)', line) |
474 | elif reading and not line.startswith(' '): | 473 | if m: |
475 | testrecipes.append(line.split(':')[0]) | 474 | testrecipes.append(m.group('recipe')) |
476 | for testrecipe in testrecipes: | 475 | for testrecipe in testrecipes: |
477 | # Check it's a valid recipe | 476 | # Check it's a valid recipe |
478 | bitbake('%s -e' % testrecipe) | 477 | bitbake('%s -e' % testrecipe) |