X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=9044a41beaa4dcb0dac36cd6756099bea417a031;hb=c382578ae3a95e9fdb3648147245c2d81bbd5a7e;hp=bf9d5757fcdd0c4176ea9cd1ebde2481a167d740;hpb=1aee04806027c9496f5860a0dfcdbd4aafde148d;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index bf9d575..9044a41 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -83,6 +83,7 @@ done
 
 inspect_wgt() {
 	wgtfile=$1
+	WGTNAME=$2
 
 	export SERVICE_PLATFORM=0
 	export SERVICE_USER=0
@@ -120,6 +121,15 @@ inspect_wgt() {
 		    export APPLICATION_USER=1
 		    # no other type known (yet)
 		fi
+		# the file naming convention is servicename.wgt
+		# but some didnt respect it
+		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"
+		else
+			echo "DEBUG: detected service name as $WGTSERVICENAME"
+		fi
 	else
 		echo "DEBUG: fail to unzip"
 	fi
@@ -171,7 +181,7 @@ do_release_test() {
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
-	NAMEID=$(grep id\\\":\\\"${WGTNAME}\" $LIST | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep id\\\":\\\"${WGTSERVICENAME}\" $LIST | cut -d\" -f4 | cut -d\\ -f1)
 	if [ ! -z "$NAMEID" ];then
 		echo "DEBUG: $WGTNAME already installed as $NAMEID"
 		# need to kill then deinstall
@@ -216,7 +226,7 @@ do_release_test() {
 		lava-test-case afm-util-install-$WGTNAMEF --result pass
 	fi
 	# message is like \"added\":\"mediaplayer@0.1\"
-	NAMEID=$(grep d\\\":\\\"${WGTNAME}\" $OUT | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep d\\\":\\\"${WGTSERVICENAME}\" $OUT | cut -d\" -f4 | cut -d\\ -f1)
 	if [ -z "$NAMEID" ];then
 		echo "ERROR: Cannot get nameid"
 		echo "DEBUG: ========== DUMPING output =========="
@@ -353,37 +363,50 @@ WGTNAMES=$(grep -o '[a-z-]*.wgt' index.html | sed 's,.wgt$,,' | sed 's,-debug$,,
 for WGTNAME in $WGTNAMES
 do
 	if [ -e $WGTNAME.wgt ];then
-		inspect_wgt $WGTNAME.wgt
+		inspect_wgt $WGTNAME.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME.wgt
+		pytest --show-capture=no --color=no -k "not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
 	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
-	else
-		echo "WARN: cannot find $WGTNAME.wgt"
-	fi
+	# disabled due to SPEC-3608
+	#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
+	#else
+	#	echo "WARN: cannot find $WGTNAME.wgt"
+	#fi
 	if [ -e $WGTNAME-debug.wgt ];then
-		inspect_wgt $WGTNAME-debug.wgt
+		inspect_wgt $WGTNAME-debug.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME-debug.wgt
+		pytest --color=no -k "not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/
 	fi
-	if [ -e $WGTNAME-coverage.wgt ];then
-		inspect_wgt $WGTNAME-coverage.wgt
-		echo "DEBUG: coverage not handled yet"
+	if [ -e "$WGTNAME-coverage.wgt" ];then
+		gcovr-wrapper "$WGTNAME-coverage.wgt" > coverage.result
+		RET=$?
+		cat coverage.result
+		if [ $RET -eq 0 ];then
+			lava-test-case "run-test-$WGTNAME-coverage" --result pass
+			LINES_PERCENT=$(grep -o '^lines.*%' coverage.result | cut -d ' ' -f2 | cut -d% -f1)
+			lava-test-case "run-test-$WGTNAME-coverage-percentage-lines" --result pass --measurement "$LINES_PERCENT"
+			BRANCHES_PERCENT=$(grep -o '^branches.*%' coverage.result | cut -d ' ' -f2 | cut -d% -f1)
+			lava-test-case "run-test-$WGTNAME-coverage-percentage-branches" --result pass --measurement "$BRANCHES_PERCENT"
+		else
+			lava-test-case "run-test-$WGTNAME-coverage" --result fail
+		fi
 	fi
 done