For master do not check connman.service

[src/qa-testdefinitions.git] / common / scripts / service-check-nogfx.sh

diff --git a/common/scripts/service-check-nogfx.sh b/common/scripts/service-check-nogfx.sh
index 62d1b3d..3a3a3b7 100755 (executable)
--- a/common/scripts/service-check-nogfx.sh
+++ b/common/scripts/service-check-nogfx.sh
@@ -1,25 +1,54 @@
 #!/bin/bash
 
-REQUIREDSOCKETS="cynara.socket security-manager.socket"
-REQUIREDSERVICES="afm-system-daemon.service afm-user-daemon.service connman.service"
+export LANG=C
+export TERM=dumb
+export COLUMNS=1000
+
+REQUIREDSOCKETS="dbus.socket"
+REQUIREDSERVICES=""
 
 ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
 RESULT="unknown"
 
+# add delay for services to fully start
+sleep 5
+
 for i in ${ALL} ; do
-    echo -e "\n########## Test for service ${i} being active ##########\n"
+    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"
+        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}
+    systemctl status ${i} || true
+    echo -e "\n\n"
 
-    if [ x"fail" == x"${RESULT}" ] ; then
-        systemctl status ${i} || true
-    fi
-    echo -e "\n########## Result for service ${i} : $RESULT ##########\n"
+    echo -e "\n\n########## Result for service ${i} : $RESULT ##########\n\n"
 done
 
-exit 0
\ No newline at end of file
+
+echo "------------------------------------------------"
+echo "All systemd units:"
+echo "------------------------------------------------"
+systemctl list-units || true
+echo "------------------------------------------------"
+echo "Only the failed systemd units:"
+echo "------------------------------------------------"
+( systemctl list-units | grep failed ) || true
+
+
+exit 0