X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fagl-screenshot-test.sh;h=cf565668bb502aa7ea7955e0e9f228208104970d;hb=refs%2Ftags%2Fneedlefish_13.93.0;hp=cdd536a14fd1b33d114be6fd277259d5912d5f3a;hpb=d22dd67991f33efb38295cf2b9fe392a27178005;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/agl-screenshot-test.sh b/common/scripts/agl-screenshot-test.sh
index cdd536a..cf56566 100755
--- a/common/scripts/agl-screenshot-test.sh
+++ b/common/scripts/agl-screenshot-test.sh
@@ -37,9 +37,13 @@ sleep 2
 # create initial journal cursor file
 journalctl /usr/bin/agl-compositor --cursor-file=/tmp/agl-screenshot-cursor > /tmp/first-log 2>&1
 
-# restart weston@display
-#systemctl restart weston.service
-systemctl restart agl-session@agl-driver.service
+# 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'
+su $AGLDRIVER -c 'XDG_RUNTIME_DIR=/run/user/1001/ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus systemctl --user start launcher'
 
 # e.g. qemu-system-arm takes loooong
 sleep 10
@@ -115,14 +119,12 @@ 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
+		if [ -x ./artiproxy-upload.sh ];then
+			./artiproxy-upload.sh $i dumpjournal
+		fi
 	done
 	echo "#########################"
-	cat /run/platform/display/*.log
+	journalctl -t agl-compositor
 	echo "#########################"
 	journalctl -b --no-pager -a
 	echo "#########################"