diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-04 16:22:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 00:11:39 +0000 |
commit | 6b564ae35d35693476513141ab9ae49aa734c7eb (patch) | |
tree | a9fc52eb727964ac4170466c1eef4a39504f05d6 | |
parent | d8efd2e3072264642fd80dadef9dfe54cf566cac (diff) | |
download | poky-6b564ae35d35693476513141ab9ae49aa734c7eb.tar.gz |
ext-sdk-prepare: Catch setscene tasks which should have run but didn't
When installing the eSDK, if setscene task fail for some reason, the tests
would ignore this. This is bad since we assume they're working.
This adds some sanity test code which detects if setscene tasks are
needing to run and errors if there are any.
(From OE-Core rev: 7ea670c3b00439ca5eeb6ae1efd475f0954268b7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/files/ext-sdk-prepare.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index 143e0feba0..c99e34f371 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py | |||
@@ -72,12 +72,14 @@ def main(): | |||
72 | else: | 72 | else: |
73 | line = line.split('Running', 1)[-1] | 73 | line = line.split('Running', 1)[-1] |
74 | unexpected.append(line.rstrip()) | 74 | unexpected.append(line.rstrip()) |
75 | elif 'Running setscene' in line: | ||
76 | unexpected.append(line.rstrip()) | ||
75 | except subprocess.CalledProcessError as e: | 77 | except subprocess.CalledProcessError as e: |
76 | print('ERROR: Failed to execute dry-run:\n%s' % e.output) | 78 | print('ERROR: Failed to execute dry-run:\n%s' % e.output) |
77 | return 1 | 79 | return 1 |
78 | 80 | ||
79 | if unexpected: | 81 | if unexpected: |
80 | print('ERROR: Unexpected tasks left over to be executed:') | 82 | print('ERROR: Unexpected tasks or setscene left over to be executed:') |
81 | for line in unexpected: | 83 | for line in unexpected: |
82 | print(' ' + line) | 84 | print(' ' + line) |
83 | return 1 | 85 | return 1 |