X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=9044a41beaa4dcb0dac36cd6756099bea417a031;hb=c382578ae3a95e9fdb3648147245c2d81bbd5a7e;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..9044a41 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -123,7 +123,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,35 +365,48 @@ do
 	if [ -e $WGTNAME.wgt ];then
 		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 $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 $WGTNAME
-		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