frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Use Xwayland instead of wayland/weston-info 

When neither `wayland-info` nor `weston-info` are installed, the
`xwayland-piglit.sh` script will wait indefinitely for the compositor
to start.

Use `Xwayland -pogo` instead to wait until weston is initialized.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1536
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: José Expósito <jexposit@redhat.com>
This commit is contained in:
José Expósito 2023-08-25 10:07:03 +02:00 committed by Olivier Fourdan
parent e820030de2
commit 8cce7f5d64
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/scripts/xwayland-piglit.sh
View File

@ -17,13 +17,8 @@ weston --no-config --backend=headless-backend.so --socket=wayland-$$ &
WESTON_PID=$!
export WAYLAND_DISPLAY=wayland-$$
# We can use either wayland-info or weston-info (deprecated), depending
# on what's actually available.
WAYLAND_INFO=wayland-info
command -V $WAYLAND_INFO >/dev/null 2>&1 || WAYLAND_INFO=weston-info
# Wait for weston to initialize before starting Xwayland
timeout --preserve-status 60s bash -c "while ! $WAYLAND_INFO &>/dev/null; do sleep 1; done"
timeout --preserve-status 60s bash -c "while ! $XSERVER_BUILDDIR/hw/xwayland/Xwayland -pogo &>/dev/null; do sleep 1; done"
# Start an Xwayland server
export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xwayland