aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-09-11 22:57:43 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-09-11 22:57:43 +0000
commit76e8255fe3f4628a18808c3973323068af579b64 (patch)
treee18e9f1802ea23ad0047ae78b738d9171d472075
parenta07c1a431cc8883a8a51fef17990b5465dbe87a0 (diff)
parent9c3c11e82280d72d34a6c0f32d255d6a0f1b23c8 (diff)
Merge "Use the new arg --build-tags and the arg --device-tags"
-rwxr-xr-xcommon/scripts/service-check-gfx.sh34
-rw-r--r--test-suites/short-smoke/service-check.yaml7
2 files changed, 33 insertions, 8 deletions
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}
diff --git a/test-suites/short-smoke/service-check.yaml b/test-suites/short-smoke/service-check.yaml
index 8c680c9..a7f7b1d 100644
--- a/test-suites/short-smoke/service-check.yaml
+++ b/test-suites/short-smoke/service-check.yaml
@@ -8,8 +8,11 @@ metadata:
- openembedded
scope:
- functional
+params:
+ BUILD_TAGS: ""
+ DEVICE_TAGS: ""
run:
steps:
- - "cd common/scripts"
- - "./service-check-gfx.sh"
+ - cd common/scripts
+ - ./service-check-gfx.sh -b "${BUILD_TAGS}" -d "${DEVICE_TAGS}"