X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=26745306e9f2e895c2ce3b0efa6e4daf128a4a89;hb=1718c39f29f71b99d38065686770548f8e4333ee;hp=bf9d5757fcdd0c4176ea9cd1ebde2481a167d740;hpb=1aee04806027c9496f5860a0dfcdbd4aafde148d;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index bf9d575..2674530 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -83,6 +83,7 @@ done
 
 inspect_wgt() {
 	wgtfile=$1
+	WGTNAME=$2
 
 	export SERVICE_PLATFORM=0
 	export SERVICE_USER=0
@@ -120,6 +121,15 @@ inspect_wgt() {
 		    export APPLICATION_USER=1
 		    # no other type known (yet)
 		fi
+		# the file naming convention is servicename.wgt
+		# but some didnt respect it
+		export WGTSERVICENAME=$(grep 'id=.*' config.xml | cut -d= -f2 | cut -d'"' -f2)
+		if [ -z "$WGTSERVICENAME" ];then
+			echo "WARN: failed to find name in config.xml, fallback to filename"
+			export WGTSERVICENAME="$WGTNAME"
+		else
+			echo "DEBUG: detected service name as $WGTSERVICENAME"
+		fi
 	else
 		echo "DEBUG: fail to unzip"
 	fi
@@ -171,7 +181,7 @@ do_release_test() {
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
-	NAMEID=$(grep id\\\":\\\"${WGTNAME}\" $LIST | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep id\\\":\\\"${WGTSERVICENAME}\" $LIST | cut -d\" -f4 | cut -d\\ -f1)
 	if [ ! -z "$NAMEID" ];then
 		echo "DEBUG: $WGTNAME already installed as $NAMEID"
 		# need to kill then deinstall
@@ -216,7 +226,7 @@ do_release_test() {
 		lava-test-case afm-util-install-$WGTNAMEF --result pass
 	fi
 	# message is like \"added\":\"mediaplayer@0.1\"
-	NAMEID=$(grep d\\\":\\\"${WGTNAME}\" $OUT | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep d\\\":\\\"${WGTSERVICENAME}\" $OUT | cut -d\" -f4 | cut -d\\ -f1)
 	if [ -z "$NAMEID" ];then
 		echo "ERROR: Cannot get nameid"
 		echo "DEBUG: ========== DUMPING output =========="
@@ -353,7 +363,7 @@ WGTNAMES=$(grep -o '[a-z-]*.wgt' index.html | sed 's,.wgt$,,' | sed 's,-debug$,,
 for WGTNAME in $WGTNAMES
 do
 	if [ -e $WGTNAME.wgt ];then
-		inspect_wgt $WGTNAME.wgt
+		inspect_wgt $WGTNAME.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME.wgt
 	else
 		echo "WARN: cannot find $WGTNAME.wgt"
@@ -378,11 +388,11 @@ do
 		echo "WARN: cannot find $WGTNAME.wgt"
 	fi
 	if [ -e $WGTNAME-debug.wgt ];then
-		inspect_wgt $WGTNAME-debug.wgt
+		inspect_wgt $WGTNAME-debug.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME-debug.wgt
 	fi
 	if [ -e $WGTNAME-coverage.wgt ];then
-		inspect_wgt $WGTNAME-coverage.wgt
+		inspect_wgt $WGTNAME-coverage.wgt $WGTNAME
 		echo "DEBUG: coverage not handled yet"
 	fi
 done