From 9c3c11e82280d72d34a6c0f32d255d6a0f1b23c8 Mon Sep 17 00:00:00 2001 From: Khouloud Touil Date: Wed, 7 Aug 2019 17:08:30 +0200 Subject: Use the new arg --build-tags and the arg --device-tags Use the new arg --build-tags along with the arg --device-tags to decide the tests to be run and the tests to be skiped. The test to be tested in this patch is for the weston service. Bug-AGL: SPEC-2721 Change-Id: Ia34680c5e60e27dfe286626fedc5775efff87ba3 Signed-off-by: Khouloud Touil --- common/scripts/service-check-gfx.sh | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'common/scripts') diff --git a/common/scripts/service-check-gfx.sh b/common/scripts/service-check-gfx.sh index addfda9..9064dbd 100755 --- a/common/scripts/service-check-gfx.sh +++ b/common/scripts/service-check-gfx.sh @@ -3,6 +3,21 @@ export LANG=C export TERM=dumb +while getopts ":b:d:" option; do + case "${option}" in + b) + if [[ $OPTARG = -* ]]; then + ((OPTIND--)) + continue + fi + BUILD_TAGS=${OPTARG} + ;; + d) + DEVICE_TAGS=${OPTARG} + ;; + esac +done + REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket" REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service weston.service bluetooth.service" @@ -14,12 +29,19 @@ sleep 10 for i in ${ALL} ; do echo -e "\n\n########## Test for service ${i} being active ##########\n\n" - - systemctl is-active ${i} >/dev/null 2>&1 - if [ $? -eq 0 ] ; then - RESULT="pass" - else - RESULT="fail" + RESULT="" + if [[ ${i} == "weston.service" ]]; then + if [[ ${DEVICE_TAGS} != *"screen"* ]] || [[ ${BUILD_TAGS} != *"screen"* ]]; then + RESULT="skip" + fi + fi + if [[ -z $RESULT ]]; then + systemctl is-active ${i} >/dev/null 2>&1 + if [ $? -eq 0 ] ; then + RESULT="pass" + else + RESULT="fail" + fi fi lava-test-case ${i} --result ${RESULT} -- cgit 1.2.3-korg