aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-11-20 17:42:26 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-11-20 17:42:26 +0000
commit21319c189c75d071d7ba5dc43955a9d75a93e6ae (patch)
tree3096789672b8ad1005676d61d397f6eda54dae2d
parent507c21c3a1ce922da0e8fb07c0bb0d54a8e32217 (diff)
downloadopenembedded-core-contrib-jansa/morty.tar.gz
openembedded-core-contrib-jansa/morty.tar.bz2
openembedded-core-contrib-jansa/morty.zip
test-dependencies.sh: Preserve virtual:native(sdk) and virtual:multilib:(.*) as prefix (nativesdk, multilib) or suffix (native) of failed recipesjansa/morty
* when testing build with multilib enabled, all failed virtual:multilib:lib32:/path/to/foo.bb are recorded only as 'foo' instead of 'lib32-foo' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rwxr-xr-xscripts/test-dependencies.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh
index 3fb74e1762..c385f96d85 100755
--- a/scripts/test-dependencies.sh
+++ b/scripts/test-dependencies.sh
@@ -141,7 +141,7 @@ build_all() {
bitbake -k $targets 2>&1 | tee -a ${OUTPUT1}/complete.log
RESULT+=${PIPESTATUS[0]}
grep "ERROR: Task.*failed" ${OUTPUT1}/complete.log > ${OUTPUT1}/failed-tasks.log
- cat ${OUTPUT1}/failed-tasks.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb:.*@@g' | sort -u > ${OUTPUT1}/failed-recipes.log
+ cat ${OUTPUT1}/failed-tasks.log | sed 's@^.*(virtual:multilib:\([^:]*\):.*/@\1-@g; s@^.*(virtual:nativesdk:.*/@nativesdk-@g; s@^.*(virtual:native:.*/@NATIVE-@g; s@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb:.*@@g; s@^NATIVE-\(.*\)$@\1-native@g' | sort -u > ${OUTPUT1}/failed-recipes.log
}
build_every_recipe() {
@@ -178,7 +178,7 @@ build_every_recipe() {
RESULT+=${RECIPE_RESULT}
mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/failed/
grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | tee -a ${OUTPUTB}/failed-tasks.log
- grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | sed 's@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb:.*@@g' >> ${OUTPUTB}/failed-recipes.log
+ grep "ERROR: Task.*failed" ${OUTPUTB}/failed/${recipe}.log | sed 's@^.*(virtual:multilib:\([^:]*\):.*/@\1-@g; s@^.*(virtual:nativesdk:.*/@nativesdk-@g; s@^.*(virtual:native:.*/@NATIVE-@g; s@.*/@@g; s@_.*@@g; s@\.bb, .*@@g; s@\.bb:.*@@g; s@^NATIVE-\(.*\)$@\1-native@g' >> ${OUTPUTB}/failed-recipes.log
# and append also ${recipe} in case the failed task was from some dependency
echo ${recipe} >> ${OUTPUTB}/failed-recipes.log
else