Remove connman service due to netboot

[src/qa-testdefinitions.git] / common / scripts / agl-screenshot-test.sh

diff --git a/common/scripts/agl-screenshot-test.sh b/common/scripts/agl-screenshot-test.sh
index 0d58f04..030ef34 100755 (executable)
--- a/common/scripts/agl-screenshot-test.sh
+++ b/common/scripts/agl-screenshot-test.sh
@@ -9,10 +9,18 @@ SCRIPTDIR=`dirname $(readlink -f $0)`
 XDG_RUNTIME_DIR=/run/user/1001
 AGLDRIVER=agl-driver
 
+if [ -z $1 ] ; then
+    echo "No reference image passed"
+    exit 125
+fi
+
+REF_IMAGE=`readlink -f $1`
+
+# go to output directory
+cd /home/$AGLDRIVER
 
 
 
-REF_IMAGE="$1"
 
 if [ -z "${REF_IMAGE}" ]; then
        echo "No reference image passed"
@@ -32,18 +40,17 @@ sed -i '/^\[core\]/a hide-cursor=true' /etc/xdg/weston/weston.ini
 echo 'HOMESCREEN_DEMO_CI=1' > /etc/default/homescreen
 sync
 systemctl daemon-reload || true
-su - agl-driver -c 'export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1001/bus" ; systemctl --user daemon-reload' || true
 sleep 2
 
 # create initial journal cursor file
 journalctl /usr/bin/agl-compositor --cursor-file=/tmp/agl-screenshot-cursor > /tmp/first-log 2>&1
 
 # stop homescreen (shell) and launcher
-su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user stop homescreen'
-su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user stop launcher'
+systemctl stop homescreen.service
+systemctl stop launcher.service
 # restart agl-compositor
-su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user restart agl-compositor'
-su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user start homescreen'
+systemctl restart agl-compositor.service
+systemctl start homescreen.service
 
 # e.g. qemu-system-arm takes loooong
 sleep 10
@@ -85,7 +92,7 @@ AGL_SCREENSHOOTER=/usr/bin/agl-screenshooter
 #su - $AGLDRIVER -c "..."
 do_screenshot()
 {
-       su - $AGLDRIVER -c "XDG_RUNTIME_DIR=/run/user/1001 $AGL_SCREENSHOOTER -a"
+       $AGL_SCREENSHOOTER -a
        return $?
 }
 
@@ -101,7 +108,7 @@ rm -rf /home/agl-driver/agl-screenshot-*.png
 # give it a bit more time to display
 #sleep 60
 
-su - $AGLDRIVER -c "XDG_RUNTIME_DIR=/run/user/1001 $AGL_SCREENSHOOTER -l"
+$AGL_SCREENSHOOTER -l
 
 if do_screenshot ; then
        echo "Screenshot taken"
@@ -112,14 +119,14 @@ else
        exit 127
 fi
 
-ls /home/agl-driver/agl-screenshot*
+ls agl-screenshot*
 
 REF_IMAGE_SHA1SUM=`sha1sum ${REF_IMAGE} | awk -F ' ' '{print $1}'`
 
 FINALRET=1
 
 
-for SCREENSHOT in /home/agl-driver/agl-screenshot-*.png ; do
+for SCREENSHOT in agl-screenshot-*.png ; do
     IMAGE_SHA1SUM=`sha1sum $SCREENSHOT | awk -F ' ' '{print $1}'`
 
     if [ "${REF_IMAGE_SHA1SUM}" == "${IMAGE_SHA1SUM}" ]; then
@@ -134,7 +141,7 @@ for SCREENSHOT in /home/agl-driver/agl-screenshot-*.png ; do
 done
 
 if [ $FINALRET != 0 ] ; then
-    for i in /home/agl-driver/agl-screenshot-*.png ; do
+    for i in agl-screenshot-*.png ; do
        ${SCRIPTDIR}/./artiproxy-upload.sh $i "$i"
     done
     journalctl -b --no-pager -a > journal.txt
@@ -155,7 +162,9 @@ rm -rf /etc/default/homescreen
 systemctl daemon-reload
 sync
 sleep 2
-systemctl restart agl-session@agl-driver.service
+systemctl restart agl-compositor.service
+systemctl restart homescreen.service
+systemctl restart launcher.service
 
 sleep 10