Merge "Adapt service checks for gfx and nogfx case"

diff --combined common/scripts/service-check-gfx.sh
index dfde77b,f9bfa87..726035a
--- 1/common/scripts/service-check-gfx.sh
--- 2/common/scripts/service-check-gfx.sh
+++ b/common/scripts/service-check-gfx.sh
@@@ -1,28 -1,38 +1,41 @@@
  #!/bin/bash
  
+ export LANG=C
+ export TERM=dumb
+ 
  REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
- REQUIREDSERVICES="afm-system-daemon.service afm-user-daemon.service connman.service ofono.service weston.service HomeScreen.service lightmediascanner.service bluetooth.service"
+ REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service weston.service HomeScreen.service lightmediascanner.service bluetooth.service"
  
  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"
      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
  
+ 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

diff --combined common/scripts/service-check-nogfx.sh
index e893cdb,5b74ff1..16ecbee
mode 100755,100644..100644
--- 1/common/scripts/service-check-nogfx.sh
--- 2/common/scripts/service-check-nogfx.sh
+++ b/common/scripts/service-check-nogfx.sh
@@@ -1,28 -1,40 +1,43 @@@
  #!/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
+ 
+ REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
+ REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service bluetooth.service"
  
  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"
      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
  
+ 
+ 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