From e8873adc4df0a228a768013d46730457198809e1 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 9 Dec 2019 14:53:24 +0100 Subject: SPEC-2970: Do not fail ofone and bluetooth services if bluetooth tag is non present When no bluetooth dongle is present, there is a timing issue which let the service fail. So if no bluetooth tag is present, skip the service test instead of failling. Bug-AGL: SPEC-2907 Change-Id: I10755ec698ab632ffcf0eec18ebe6bc41b1b5ec1 Signed-off-by: Corentin LABBE --- common/scripts/service-check-gfx.sh | 10 ++++++++++ common/scripts/service-check-nogfx.sh | 10 ++++++++++ 2 files changed, 20 insertions(+) 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} -- cgit 1.2.3-korg