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

test: Use either wayland-info or weston-info 

weston-info has been deprecated for quite some time, whereas wayland-info
may not be available yet.

So we use either, depending on what's actually available.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Olivier Fourdan 2023-03-22 11:31:03 +01:00
parent 89163917e1
commit fc625fe172
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,13 @@ weston --no-config --backend=headless-backend.so --socket=wayland-$$ &
WESTON_PID=$! WESTON_PID=$!
export WAYLAND_DISPLAY=wayland-$$ 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 # Wait for weston to initialize before starting Xwayland
timeout --preserve-status 60s bash -c 'while ! weston-info &>/dev/null; do sleep 1; done' timeout --preserve-status 60s bash -c "while ! $WAYLAND_INFO &>/dev/null; do sleep 1; done"
# Start an Xwayland server # Start an Xwayland server
export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xwayland export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xwayland