X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=b5ee32bfdd50d5a405a4241dd4261a55e1d64740;hb=refs%2Ftags%2F9.99.1;hp=83ca34005fbbbdb3ec3e03453f8c369050836a4d;hpb=ba2a97f4acb44194cc2a827e344d71f916d432b8;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 83ca340..b5ee32b 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -3,10 +3,8 @@
 set -x
 
 export TERM=dumb
+export COLUMNS=1000
 
-SERVICE_PLATFORM=0
-SERVICE_USER=0
-APPLICATION_USER=0
 AGLDRIVER=agl-driver
 
 while [ $# -ge 1 ]
@@ -30,25 +28,48 @@ if [ -z "$BASEURL" ]; then
 	exit 1
 fi
 
-wget -q $BASEURL -O index.html
-if [ $? -ne 0 ];then
-	echo "ERROR: Cannot wget $BASEURL"
-	exit 1
+do_afm_util()
+{
+set -x
+	if [ $SERVICE_USER -eq 1 -o $APPLICATION_USER -eq 1 ];then
+		su - $AGLDRIVER -c "afm-util $*"
+	else
+		afm-util $*
+	fi
+	return $?
+}
+
+if [ ! -f index.html ] ; then
+	wget -q $BASEURL -O index.html
+	if [ $? -ne 0 ];then
+	    echo "ERROR: Cannot wget $BASEURL"
+		exit 1
+	fi
 fi
 
 grep -o '[a-z-]*.wgt' index.html | sort | uniq |
 while read wgtfile
 do
 	WGTNAME=$(echo $wgtfile | sed 's,.wgt$,,')
+	SERVICE_PLATFORM=0
+	SERVICE_USER=0
+	APPLICATION_USER=0
 	echo "DEBUG: fetch $wgtfile"
-	wget -q $BASEURL/$wgtfile
-	if [ $? -ne 0 ];then
-		echo "ERROR: wget from $BASEURL/$wgtfile"
-		continue
+
+	if [ ! -f $wgtfile ] ; then
+		wget -q $BASEURL/$wgtfile
+		if [ $? -ne 0 ];then
+			echo "ERROR: wget from $BASEURL/$wgtfile"
+			continue
+		fi
 	fi
 
 	echo "DEBUG: analyse wgt file"
 	unzip $wgtfile
+	if [ $? -ne 0 ];then
+		# TODO Do not fail yet, busybox unzip seems to "fail with success" when checking CRC
+		echo "ERROR: cannot unzip $wgtfile"
+	fi
 	if [ -f config.xml ];then
 		grep hidden config.xml
 		if [ $? -eq 0 ];then
@@ -57,9 +78,11 @@ do
 			echo "DEBUG: not hidden package"
 		fi
 		# a service sets urn:AGL:widget:provided-api
-		if $(grep "urn:AGL:widget:provided-api" config.xml) ; then
+		grep "urn:AGL:widget:provided-api" config.xml
+		if [ $? -eq 0 ] ; then
 		    # we are a service, now determine the scope ...
-		    if $(grep "urn:AGL:permission::partner:scope-platform" config.xml) ; then
+		    grep "urn:AGL:permission::partner:scope-platform" config.xml
+		    if [ $? -eq 0 ];then
 			SERVICE_PLATFORM=1
 		    else
 			SERVICE_USER=1
@@ -87,20 +110,20 @@ do
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
-	NAMEID=$(grep id\\\":\\\"${WGTNAME}@ $LIST | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep id\\\":\\\"${WGTNAME} $LIST | cut -d\" -f4 | cut -d\\ -f1)
 	if [ ! -z "$NAMEID" ];then
 		echo "DEBUG: $WGTNAME already installed as $NAMEID"
 		# need to kill then deinstall
-		afm-util ps | grep -q $WGTNAME
+		do_afm_util ps --all | grep -q $WGTNAME
 		if [ $? -eq 0 ];then
 			echo "DEBUG: kill $WGTNAME"
-			afm-util kill $WGTNAME
+			do_afm_util kill $WGTNAME
 			if [ $? -ne 0 ];then
 				echo "ERROR: afm-util kill"
-				lava-test-case afm-util-pre-kill-$WGTNAME --result fail
-				continue
-			else
-				lava-test-case afm-util-pre-kill-$WGTNAME --result pass
+				#lava-test-case afm-util-pre-kill-$WGTNAME --result fail
+				#continue
+			#else
+			#	lava-test-case afm-util-pre-kill-$WGTNAME --result pass
 			fi
 		else
 			echo "DEBUG: no need to kill $WGTNAME"
@@ -110,8 +133,9 @@ do
 		afm-util remove $NAMEID
 		if [ $? -ne 0 ];then
 			echo "ERROR: afm-util remove"
-			lava-test-case afm-util-remove-$WGTNAME --result fail
-			continue
+			#lava-test-case afm-util-remove-$WGTNAME --result fail
+			journalctl -b | tail -40
+			#continue
 		else
 			lava-test-case afm-util-remove-$WGTNAME --result pass
 		fi
@@ -131,7 +155,7 @@ do
 		lava-test-case afm-util-install-$WGTNAME --result pass
 	fi
 	# message is like \"added\":\"mediaplayer@0.1\"
-	NAMEID=$(grep d\\\":\\\"${WGTNAME}@ $OUT | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep d\\\":\\\"${WGTNAME} $OUT | cut -d\" -f4 | cut -d\\ -f1)
 	if [ -z "$NAMEID" ];then
 		echo "ERROR: Cannot get nameid"
 		continue
@@ -157,7 +181,7 @@ do
 		echo "DEBUG: end of list"
 	fi
 
-	afm-util info $NAMEID
+	do_afm_util info $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util info"
 		lava-test-case afm-util-info-$WGTNAME --result fail
@@ -170,26 +194,8 @@ do
 	echo "DEBUG: check if we see the package with systemctl -a (before start)"
 	systemctl -a |grep "afm.*$WGTNAME"
 
-	# here we need to differ between SERVICE_PLATFORM, SERVICE_USER and APPLICATION_USER
-	if test x"1" = x"$SERVICE_PLATFORM" ; then
-	    PRE_CMD="su -c ' "
-	    POST_CMD=" '"
-	fi
-	if test x"1" = x"$SERVICE_USER" ; then
-	    PRE_CMD="su $AGLDRIVER -c '"
-	    POST_CMD=" '"
-	fi
-	if test x"1" = x"$APPLICATION_USER" ; then
-	    PRE_CMD="su $AGLDRIVER -c '"
-	    POST_CMD=" '"
-	fi
-
-	# construct the command to call
-	CMD=( "$PRE_CMD" )
-	CMD+=( "afm-util start $NAMEID" )
-	CMD+=( "$POST_CMD" )
 	echo "DEBUG: start $NAMEID"
-	${CMD[@]}  > "rid"
+	do_afm_util start $NAMEID > "rid"
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util start"
 		lava-test-case afm-util-start-$WGTNAME --result fail
@@ -205,7 +211,7 @@ do
 
 	echo "DEBUG: Get RID for $NAMEID"
 	PSLIST="pslist"
-	afm-util ps > $PSLIST
+	afm-util ps --all > $PSLIST
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util ps"
 		lava-test-case afm-util-ps-$WGTNAME --result fail
@@ -218,7 +224,7 @@ do
 	RID="$(cat rid)"
 
 	echo "DEBUG: status $NAMEID ($RID)"
-	afm-util status $RID
+	do_afm_util status $RID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util status"
 		lava-test-case afm-util-status-$WGTNAME --result fail
@@ -228,7 +234,7 @@ do
 	fi
 
 	echo "DEBUG: kill $NAMEID ($RID)"
-	afm-util kill $NAMEID
+	do_afm_util kill $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util kill"
 		lava-test-case afm-util-kill-$WGTNAME --result fail
@@ -238,7 +244,7 @@ do
 	fi
 
 	echo "DEBUG: start2 $NAMEID"
-	exec "${CMD[@]}"
+	do_afm_util start $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util start2"
 		lava-test-case afm-util-start2-$WGTNAME --result fail