summaryrefslogtreecommitdiffstats
path: root/meta/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-04 16:22:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 00:11:39 +0000
commit6b564ae35d35693476513141ab9ae49aa734c7eb (patch)
treea9fc52eb727964ac4170466c1eef4a39504f05d6 /meta/files
parentd8efd2e3072264642fd80dadef9dfe54cf566cac (diff)
downloadopenembedded-core-contrib-6b564ae35d35693476513141ab9ae49aa734c7eb.tar.gz
openembedded-core-contrib-6b564ae35d35693476513141ab9ae49aa734c7eb.tar.bz2
openembedded-core-contrib-6b564ae35d35693476513141ab9ae49aa734c7eb.zip
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>
Diffstat (limited to 'meta/files')
-rw-r--r--meta/files/ext-sdk-prepare.py4
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():
else:
line = line.split('Running', 1)[-1]
unexpected.append(line.rstrip())
+ elif 'Running setscene' in line:
+ unexpected.append(line.rstrip())
except subprocess.CalledProcessError as e:
print('ERROR: Failed to execute dry-run:\n%s' % e.output)
return 1
if unexpected:
- print('ERROR: Unexpected tasks left over to be executed:')
+ print('ERROR: Unexpected tasks or setscene left over to be executed:')
for line in unexpected:
print(' ' + line)
return 1