From: Jan-Simon Moeller Date: Tue, 10 Dec 2019 13:39:37 +0000 (+0000) Subject: Merge "Skip the can test" X-Git-Tag: icefish_8.99.3 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=537e2b222a231be2827ec13aeb800283269e0e5f;hp=b83cafe507342389c2ddebd58e5020df9b3927ae;p=src%2Fqa-testdefinitions.git Merge "Skip the can test" --- diff --git a/common/scripts/service-check-gfx.sh b/common/scripts/service-check-gfx.sh index e4804e3..d7cfd85 100755 --- a/common/scripts/service-check-gfx.sh +++ b/common/scripts/service-check-gfx.sh @@ -42,6 +42,16 @@ for i in ${ALL} ; do RESULT="pass" else RESULT="fail" + if [[ ${i} == "bluetooth.service" ]]; then + if [[ ${DEVICE_TAGS} != *"bluetooth"* ]] || [[ ${BUILD_TAGS} != *"bluetooth"* ]]; then + RESULT="skip" + fi + fi + if [[ ${i} == "ofono.service" ]]; then + if [[ ${DEVICE_TAGS} != *"bluetooth"* ]] || [[ ${BUILD_TAGS} != *"bluetooth"* ]]; then + RESULT="skip" + fi + fi fi fi diff --git a/common/scripts/service-check-nogfx.sh b/common/scripts/service-check-nogfx.sh index a584e4e..4828805 100755 --- a/common/scripts/service-check-nogfx.sh +++ b/common/scripts/service-check-nogfx.sh @@ -21,6 +21,16 @@ for i in ${ALL} ; do RESULT="pass" else RESULT="fail" + if [[ ${i} == "bluetooth.service" ]]; then + if [[ ${DEVICE_TAGS} != *"bluetooth"* ]] || [[ ${BUILD_TAGS} != *"bluetooth"* ]]; then + RESULT="skip" + fi + fi + if [[ ${i} == "ofono.service" ]]; then + if [[ ${DEVICE_TAGS} != *"bluetooth"* ]] || [[ ${BUILD_TAGS} != *"bluetooth"* ]]; then + RESULT="skip" + fi + fi fi lava-test-case ${i} --result ${RESULT}