From f37d11cd96ba15b40a497d4d7bdd14a77ea9b476 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 21 Oct 2021 10:31:28 +0200 Subject: [PATCH] xwayland/test: Don't catch errors in run-piglit.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Olivier Fourdan Reviewed-by: Michel Dänzer --- test/scripts/xwayland-piglit.sh | 2 ++ 1 file changed, 2 insertions(+) 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@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=$?