aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-12-09 14:53:24 +0100
committerCorentin LABBE <clabbe@baylibre.com>2019-12-10 14:00:33 +0100
commite8873adc4df0a228a768013d46730457198809e1 (patch)
tree2e5cbf2e6af217a80be95ca1009f16e1ccf6c23c
parent5a2fd85f9a0d958ffa5a9f40a91cdbf3ec15af66 (diff)
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 <clabbe@baylibre.com>
-rwxr-xr-xcommon/scripts/service-check-gfx.sh10
-rwxr-xr-xcommon/scripts/service-check-nogfx.sh10
2 files changed, 20 insertions, 0 deletions
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}