Enable multi-screen and list screens

[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 01d8231..2e603c1 100755 (executable)
--- a/common/scripts/agl-screenshot-test.sh
+++ b/common/scripts/agl-screenshot-test.sh
@@ -80,10 +80,11 @@ fi
 
 AGL_SCREENSHOOTER=/usr/bin/agl-screenshooter
 
+
 #su - $AGLDRIVER -c "..."
 do_screenshot()
 {
-       su - $AGLDRIVER -c "XDG_RUNTIME_DIR=/run/user/1001 $AGL_SCREENSHOOTER"
+       su - $AGLDRIVER -c "XDG_RUNTIME_DIR=/run/user/1001 $AGL_SCREENSHOOTER -a"
        return $?
 }
 
@@ -99,6 +100,8 @@ 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"
+
 if do_screenshot ; then
        echo "Screenshot taken"
 else
@@ -108,6 +111,8 @@ else
        exit 127
 fi
 
+ls /home/agl-driver/agl-screenshot*
+
 REF_IMAGE_SHA1SUM=`sha1sum ${REF_IMAGE} | awk -F ' ' '{print $1}'`
 IMAGE_SHA1SUM=`sha1sum /home/agl-driver/agl-screenshot-*.png | awk -F ' ' '{print $1}'`
 
@@ -115,18 +120,21 @@ if [ "${REF_IMAGE_SHA1SUM}" == "${IMAGE_SHA1SUM}" ]; then
        echo "Screenshot matches the reference image"
        FINALRET=0
 else
+set -x
        echo "Screenshot does not match the reference image"
        FINALRET=127
-       for i in agl-screenshot-*.png ; do
+       for i in /home/agl-driver/agl-screenshot-*.png ; do
                if [ -x ./artiproxy-upload.sh ];then
-                       ./artiproxy-upload.sh $i dumpjournal
+                       ./artiproxy-upload.sh $i $(basename $i)
                fi
+set +x
        done
        echo "#########################"
        journalctl -t agl-compositor
        echo "#########################"
        journalctl -b --no-pager -a
        echo "#########################"
+       exit 127
 fi