diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-06-23 12:58:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:22:42 +0100 |
commit | 52adfed684d111e91eadaae2ffdfaf90011449a0 (patch) | |
tree | b1e2bb1f07f5b051e8010d363a7c4e682da477d3 | |
parent | 3b208bc24b17a196a5b891e331d0a9a66e9ef02c (diff) | |
download | poky-52adfed684d111e91eadaae2ffdfaf90011449a0.tar.gz |
test-dependencies.sh: Strip also '\.bb; .*' before adding failed recipe to list of failed
* format of bitbake tasks changed in:
2c88afb taskdata/runqueue: Rewrite without use of ID indirection
-ERROR: Task 4 (/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb, do_fetch) failed with exit code '1'
+ERROR: Task /OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch (/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch) failed with exit code '1'
so strip not only '\.bb, .*' used before, but also '\.bb;.*' to drop
the task name to get recipe name.
* for more details see:
http://lists.openembedded.org/pipermail/openembedded-core/2016-June/123132.html
* without this change you can see test-dependencies.sh trying to rebuild packages
like:
Building recipe: fbprogress (6/21)
Building recipe: fbprogress.bb:do (7/21)
where the later of course doesn't exist as a recipe
(From OE-Core rev: b7d6d4203cf2021ee2b9b84c8faf15198bfb536d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/test-dependencies.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh index 0170947f0e..00c50e0d6c 100755 --- a/scripts/test-dependencies.sh +++ b/scripts/test-dependencies.sh | |||
@@ -141,7 +141,7 @@ build_all() { | |||
141 | bitbake -k $targets 2>&1 | tee -a ${OUTPUT1}/complete.log | 141 | bitbake -k $targets 2>&1 | tee -a ${OUTPUT1}/complete.log |
142 | RESULT+=${PIPESTATUS[0]} | 142 | RESULT+=${PIPESTATUS[0]} |
143 | grep "ERROR: Task.*failed" ${OUTPUT1}/complete.log > ${OUTPUT1}/failed-tasks.log | 143 | grep "ERROR: Task.*failed" ${OUTPUT1}/complete.log > ${OUTPUT1}/failed-tasks.log |
144 | cat ${OUTPUT1}/failed-tasks.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g' | sort -u > ${OUTPUT1}/failed-recipes.log | 144 | cat ${OUTPUT1}/failed-tasks.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb;.*@@g' | sort -u > ${OUTPUT1}/failed-recipes.log |
145 | } | 145 | } |
146 | 146 | ||
147 | build_every_recipe() { | 147 | build_every_recipe() { |
@@ -178,7 +178,7 @@ build_every_recipe() { | |||
178 | RESULT+=${RECIPE_RESULT} | 178 | RESULT+=${RECIPE_RESULT} |
179 | mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/failed/ | 179 | mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/failed/ |
180 | grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | tee -a ${OUTPUTB}/failed-tasks.log | 180 | grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | tee -a ${OUTPUTB}/failed-tasks.log |
181 | grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g' >> ${OUTPUTB}/failed-recipes.log | 181 | grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb;.*@@g' >> ${OUTPUTB}/failed-recipes.log |
182 | # and append also ${recipe} in case the failed task was from some dependency | 182 | # and append also ${recipe} in case the failed task was from some dependency |
183 | echo ${recipe} >> ${OUTPUTB}/failed-recipes.log | 183 | echo ${recipe} >> ${OUTPUTB}/failed-recipes.log |
184 | else | 184 | else |