From 8beb671843f1f8b6613e286c17e746f64c33ffa5 Mon Sep 17 00:00:00 2001 From: Bill Randle Date: Wed, 13 Apr 2016 10:17:42 -0700 Subject: ext-sdk-prepare.py: exclude do_rm_work from unexpected output; create unit test When installing the esdk with INHERIT += "rm_work", the script complains about do_rm_work as unexpected output from the bitbake run. This patch ignores any output lines with do_rm_work and further refactors the output comparison into its own function creates a new unit test to verify the fix. The unit test can be run direct from the command line or via oe-selftest. [YOCTO #9019] (From OE-Core rev: d41930e1daa933cf4bf063fa79a2e8fc9129e1b1) Signed-off-by: Bill Randle Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/files/ext-sdk-prepare.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'meta/files') diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index 80db8bb16a..605e2ebefa 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py @@ -27,6 +27,21 @@ def exec_watch(cmd, **options): return process.returncode, buf +def check_unexpected(lines, recipes): + """Check for unexpected output lines from dry run""" + unexpected = [] + for line in lines.splitlines(): + if 'Running task' in line: + for recipe in recipes: + if recipe in line: + break + else: + line = line.split('Running', 1)[-1] + if 'do_rm_work' not in line: + unexpected.append(line.rstrip()) + elif 'Running setscene' in line: + unexpected.append(line.rstrip()) + return unexpected def main(): if len(sys.argv) < 2: @@ -67,17 +82,7 @@ def main(): try: out = subprocess.check_output('bitbake %s -n' % ' '.join(sdk_targets), stderr=subprocess.STDOUT, shell=True) - unexpected = [] - for line in out.splitlines(): - if 'Running task' in line: - for recipe in recipes: - if recipe in line: - break - else: - line = line.split('Running', 1)[-1] - unexpected.append(line.rstrip()) - elif 'Running setscene' in line: - unexpected.append(line.rstrip()) + unexpected = check_unexpected(out, recipes) except subprocess.CalledProcessError as e: print('ERROR: Failed to execute dry-run:\n%s' % e.output) return 1 -- cgit v1.2.3-54-g00ecf