X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=0bc7f08c3e7cb2e65e1ad3ac0ba8812e29d2934d;hb=225cd026b8baea8e38b29187309e734ea373288f;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..0bc7f08 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 @@ -30,10 +31,8 @@ fi do_afm_util() { 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 $? @@ -109,7 +108,7 @@ do if [ ! -z "$NAMEID" ];then echo "DEBUG: $WGTNAME already installed as $NAMEID" # need to kill then deinstall - afm-util ps | grep -q $WGTNAME + afm-util ps --all | grep -q $WGTNAME if [ $? -eq 0 ];then echo "DEBUG: kill $WGTNAME" afm-util kill $WGTNAME @@ -175,7 +174,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 +204,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 +217,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 +227,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