Add image upload to qa-testdefinition.

[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 8005e5f..7cbc23c 100755 (executable)
--- a/common/scripts/agl-screenshot-test.sh
+++ b/common/scripts/agl-screenshot-test.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 
-#set -x
+set -x
+
+export TERM=dumb
+export COLUMNS=1000
+
+XDG_RUNTIME_DIR=/run/user/1001
+AGLDRIVER=agl-driver
+
+
+
 
 REF_IMAGE="$1"
 
@@ -19,31 +28,51 @@ sed -i '/^\[core\]/a activate-by-default=false' /etc/xdg/weston/weston.ini
 # setup homescreen env variable
 sed -i '/^\[core\]/a hide-cursor=true' /etc/xdg/weston/weston.ini
 # enable red/green/blue test screen
-echo 'HOMESCREEN_DEMO_CI=1' > /etc/afm/unit.env.d/screenshot
+echo 'HOMESCREEN_DEMO_CI=1' > /etc/default/homescreen
 sync
-systemctl daemon-reload
+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
-# restart weston@display
-systemctl restart weston@display.service
-# e.g. qemu-system-arm takes loooong
-sleep 60
-echo "Waiting for compositor to initialize (+60sec)."
 
-if ! grep -q 'Usable area:' /run/platform/display/compositor.log ; then
+# 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'
+# 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'
+
 # e.g. qemu-system-arm takes loooong
-        echo "Waiting for compositor to initialize (+60sec)."
+sleep 10
+echo "Waiting for compositor to initialize (+10sec)."
+
+LOOP=20
+while test $LOOP -ge 1 ; do
+
+  ( mv /tmp/next-log /tmp/prev-log > /dev/null 2>&1 ) || true
+  journalctl /usr/bin/agl-compositor --cursor-file=/tmp/agl-screenshot-cursor > /tmp/next-log 2>&1
+  if ! grep -q 'Usable area:' /tmp/next-log ; then
+  # e.g. qemu-system-arm takes loooong
+        echo "Waiting for compositor to initialize (+60sec). Loop: $LOOP"
        sleep 60
-fi
-if ! grep -q 'Usable area:' /run/platform/display/compositor.log ; then
-# e.g. qemu-system-arm takes loooong
-        echo "Waiting for compositor to initialize (+120sec)."
-       sleep 120
-fi
+       LOOP="$(($LOOP-1))"
+       continue
+  fi
+  break
+done
+
+#read aw
 
-if ! grep -q 'Usable area:' /run/platform/display/compositor.log ; then
+
+# giving up now
+if ! grep -q 'Usable area:' /tmp/next-log ; then
        echo "Marker ('Usable area:') not found. Dumping log."
        echo "##################################"
-       cat /run/platform/display/compositor.log
+       cat /tmp/first-log
+       cat /tmp/prev-log
+       cat /tmp/next-log
        echo "##################################"
         exit 127
        #echo "CONTINUING ANYWAY !"
@@ -51,25 +80,36 @@ fi
 
 AGL_SCREENSHOOTER=/usr/bin/agl-screenshooter
 
+#su - $AGLDRIVER -c "..."
+do_screenshot()
+{
+       su - $AGLDRIVER -c "XDG_RUNTIME_DIR=/run/user/1001 $AGL_SCREENSHOOTER"
+       return $?
+}
+
+
 if [ -z "$AGL_SCREENSHOOTER" ]; then
        echo "Failed to find agl-screenshooter. Compositor too old?"
        exit 127
 fi
 
 #echo "Found agl-screenshoooter in $AGL_SCREENSHOOTER"
-rm -rf agl-screenshot-*.png
+rm -rf /home/agl-driver/agl-screenshot-*.png
 
-if $AGL_SCREENSHOOTER; then
+# give it a bit more time to display
+#sleep 60
+
+if do_screenshot ; then
        echo "Screenshot taken"
 else
        echo "##################################"
-       cat /run/platform/display/compositor.log
+       journalctl --no-pager -a -b /usr/bin/agl-compositor
        echo "##################################"
        exit 127
 fi
 
 REF_IMAGE_SHA1SUM=`sha1sum ${REF_IMAGE} | awk -F ' ' '{print $1}'`
-IMAGE_SHA1SUM=`sha1sum agl-screenshot-*.png | awk -F ' ' '{print $1}'`
+IMAGE_SHA1SUM=`sha1sum /home/agl-driver/agl-screenshot-*.png | awk -F ' ' '{print $1}'`
 
 if [ "${REF_IMAGE_SHA1SUM}" == "${IMAGE_SHA1SUM}" ]; then
        echo "Screenshot matches the reference image"
@@ -77,15 +117,13 @@ if [ "${REF_IMAGE_SHA1SUM}" == "${IMAGE_SHA1SUM}" ]; then
 else
        echo "Screenshot does not match the reference image"
        FINALRET=127
-       for i in agl-screenshot-*.png ; do
-               #set +x
-               echo "################################################################"
-               ( curl --upload-file "$i" https://transfer.sh/$(basename "$i") && echo "" ) || true
-               echo "################################################################"
-               #set -x
+       for i in /home/agl-driver/agl-screenshot-*.png ; do
+               if [ -x ./artiproxy-upload.sh ];then
+                       ./artiproxy-upload.sh $i $(basename $i)
+               fi
        done
        echo "#########################"
-       cat /run/platform/display/*.log
+       journalctl -t agl-compositor
        echo "#########################"
        journalctl -b --no-pager -a
        echo "#########################"
@@ -96,11 +134,12 @@ fi
 sed -i '/activate-by-default=false/d' /etc/xdg/weston/weston.ini
 sed -i '/hide-cursor=true/d' /etc/xdg/weston/weston.ini
 #rm -rf /etc/systemd/system/weston@.service.d
-rm -rf /etc/afm/unit.env.d/screenshot
+rm -rf /etc/default/homescreen
 systemctl daemon-reload
 sync
 sleep 2
-systemctl restart weston@display.service
+systemctl restart agl-session@agl-driver.service
+
 sleep 10
 
 exit $FINALRET