X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=6e7394f164bc8dd458424caf7e4e265febf40864;hb=1cba00345f7c2cf81a36297ecae83ffb133bff22;hp=ee3d790616cd2a1b10386937d31d362d3876a605;hpb=ec4faa26c9639a8bb6a5b025dc94de57ac874d78;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index ee3d790..6e7394f 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -7,6 +7,10 @@ export COLUMNS=1000
 
 AGLDRIVER=agl-driver
 
+# for pyagl - unless redefined in a test
+export AGL_AVAILABLE_INTERFACES="ethernet"
+export AGL_CAN_INTERFACE="vcan0"
+
 while [ $# -ge 1 ]
 do
 	case $1 in
@@ -123,7 +127,7 @@ inspect_wgt() {
 		fi
 		# the file naming convention is servicename.wgt
 		# but some didnt respect it
-		export WGTSERVICENAME=$(grep '<name>' config.xml | cut -d'>' -f2 | cut -d'<' -f1)
+		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 +369,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 +377,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