xserver: Branch 'master'

[GitLab Mirror]

 test/scripts/xwayland-piglit.sh |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f37d11cd96ba15b40a497d4d7bdd14a77ea9b476
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Oct 21 10:31:28 2021 +0200

    xwayland/test: Don't catch errors in run-piglit.sh
    
    The xwayland-piglit.sh script spawns weston, runs run-piglit.sh and
    finally kills weston.
    
    However, this whole script is running with “-e” meaning that any error
    will cause the script to exit immediately.
    
    As a result, if run-piglit.sh exits with a non-zero code such as 77 for
    skipping the test, the script will exit prematurely leaving weston
    running, and meson will simply wait until the timeout kicks in, and
    fail eventually instead of skipping the test as it should.
    
    Fix this by removing the option to exit immediately prior to spawn the
    script run-piglit.sh.
    
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1204
    Suggested-by: Michel Dänzer <mdaenzer at redhat.com>
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh
index f0bb9727b..a898008eb 100755
--- a/test/scripts/xwayland-piglit.sh
+++ b/test/scripts/xwayland-piglit.sh
@@ -36,6 +36,8 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xcopyarea at 1"
 
 export PIGLIT_ARGS
 
+# Do not let run-piglit.sh exit status terminate this script prematurely
+set +e
 $XSERVER_DIR/test/scripts/run-piglit.sh
 PIGLIT_STATUS=$?