summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-06-13 23:22:25 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-06-13 23:22:25 +0200
commitb4aef27928ee7897aae9de1b5fa47d0aad61803c (patch)
treeb11f951246b5542370b727128d428f9b887c0783
parentbb9b102d3a79517cead966b2afc180a7711da7ff (diff)
Adapt screenshot tests after session removal
Adapt the scripts. Bug-AGL: SPEC-4813 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ief1ca6d35ed4f891082660500c0ab08b307e7674
-rwxr-xr-xcommon/scripts/agl-screenshot-test.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/common/scripts/agl-screenshot-test.sh b/common/scripts/agl-screenshot-test.sh
index cb28c05..030ef34 100755
--- a/common/scripts/agl-screenshot-test.sh
+++ b/common/scripts/agl-screenshot-test.sh
@@ -40,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
@@ -93,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 $?
}
@@ -109,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"
@@ -163,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