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

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 551e5b6..b5ee32b 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -3,6 +3,7 @@
 set -x
 
 export TERM=dumb
+export COLUMNS=1000
 
 AGLDRIVER=agl-driver
 
@@ -29,20 +30,21 @@ fi
 
 do_afm_util()
 {
+set -x
 	if [ $SERVICE_USER -eq 1 -o $APPLICATION_USER -eq 1 ];then
-		echo "DEBUG: do_afm_util as $AGLDRIVER"
 		su - $AGLDRIVER -c "afm-util $*"
 	else
-		echo "DEBUG: do_afm_util as $(whoami)"
 		afm-util $*
 	fi
 	return $?
 }
 
-wget -q $BASEURL -O index.html
-if [ $? -ne 0 ];then
-	echo "ERROR: Cannot wget $BASEURL"
-	exit 1
+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 |
@@ -53,10 +55,13 @@ do
 	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"
@@ -105,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"
@@ -128,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
@@ -149,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
@@ -175,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
@@ -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