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

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 2674530..403116e 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -7,6 +7,9 @@ export COLUMNS=1000
 
 AGLDRIVER=agl-driver
 
+# for pyagl - unless redefined in a test
+AGL_AVAILABLE_INTERFACES="ethernet"
+
 while [ $# -ge 1 ]
 do
 	case $1 in
@@ -123,7 +126,7 @@ inspect_wgt() {
 		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)
+		export WGTSERVICENAME=$(grep 'id=.*' config.xml | sed 's,^.*id=,id=,' | 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"
@@ -365,25 +368,7 @@ do
 	if [ -e $WGTNAME.wgt ];then
 		inspect_wgt $WGTNAME.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME.wgt
-	else
-		echo "WARN: cannot find $WGTNAME.wgt"
-	fi
-	if [ -e $WGTNAME-test.wgt ];then
-		# wgt-test do not have the same permissions in the config.xml as the parent wgt
-		# so keep the value from last run
-		#inspect_wgt $WGTNAME-test.wgt
-		check_service_running $WGTNAME
-		if [ $? -eq 1 ];then
-			do_afm_test $TOPDIR/$WGTNAME-test.wgt
-			if [ $? -eq 0 ];then
-				lava-test-case run-test-$WGTNAME --result pass
-			else
-				lava-test-case run-test-$WGTNAME --result fail
-			fi
-		else
-			echo "DEBUG: $WGTNAME is not running, skipping test"
-			lava-test-case run-test-$WGTNAME --result skip
-		fi
+		pytest --show-capture=no --color=no -k "not hwrequired and not internet" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
 	else
 		echo "WARN: cannot find $WGTNAME.wgt"
 	fi
@@ -391,9 +376,5 @@ do
 		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 $WGTNAME
-		echo "DEBUG: coverage not handled yet"
-	fi
 done