summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-10-10 23:06:21 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-10-10 23:06:21 +0200
commita2a853be927de72bf582efb8da256159f5aeaf68 (patch)
treec5e164230b1a2af0d42f85ef670a104397478c38 /common
parentb3186538163e873fd58986184586ac5a4463fd17 (diff)
Prepare the nogfx variant of the service check
and enhance verbosity. Change-Id: Ia95a6236ffc4229703714ad58b70b21c00884c5c Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'common')
-rwxr-xr-xcommon/scripts/service-check-gfx.sh (renamed from common/scripts/service-check.sh)9
-rwxr-xr-xcommon/scripts/service-check-nogfx.sh25
2 files changed, 31 insertions, 3 deletions
diff --git a/common/scripts/service-check.sh b/common/scripts/service-check-gfx.sh
index 4dc0a25..2a5353b 100755
--- a/common/scripts/service-check.sh
+++ b/common/scripts/service-check-gfx.sh
@@ -7,16 +7,19 @@ ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
RESULT="unknown"
for i in ${ALL} ; do
- echo "########## Test for service ${i} being active ##########"
+ echo -e "\n########## Test for service ${i} being active ##########\n"
systemctl is-active ${i} >/dev/null 2>&1
if [ $? -eq 0 ] ; then
RESULT="pass"
else
- systemctl status ${i} || true
RESULT="fail"
fi
- echo "########## Result for service ${i} : $RESULT ##########"
lava-test-case ${i} --result ${RESULT}
+
+ if [ x"fail" == x"${RESULT}" ] ; then
+ systemctl status ${i} || true
+ fi
+ echo -e "\n########## Result for service ${i} : $RESULT ##########\n"
done
exit 0 \ No newline at end of file
diff --git a/common/scripts/service-check-nogfx.sh b/common/scripts/service-check-nogfx.sh
new file mode 100755
index 0000000..62d1b3d
--- /dev/null
+++ b/common/scripts/service-check-nogfx.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+REQUIREDSOCKETS="cynara.socket security-manager.socket"
+REQUIREDSERVICES="afm-system-daemon.service afm-user-daemon.service connman.service"
+
+ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
+RESULT="unknown"
+
+for i in ${ALL} ; do
+ echo -e "\n########## Test for service ${i} being active ##########\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}
+
+ if [ x"fail" == x"${RESULT}" ] ; then
+ systemctl status ${i} || true
+ fi
+ echo -e "\n########## Result for service ${i} : $RESULT ##########\n"
+done
+
+exit 0 \ No newline at end of file