test-dependencies.sh: Preserve virtual:native(sdk) and virtual:multilib:(.*) as prefi...

* 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>

diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh
index 3fb74e1762a3a67280759ec11f25565f3c76adcf..c385f96d856c700e29ab871ce8d3605dadcac1fa 100755 (executable)
--- 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