diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2021-10-21 10:31:28 +0200 |
|---|---|---|
| committer | Olivier Fourdan <ofourdan@redhat.com> | 2021-10-21 11:35:36 +0200 |
| commit | 0401e85a3cef8eee2daf097c794a4eedd454cb02 (patch) | |
| tree | 1e5ac2f57900ad5f1244320140d08581ba93a256 | |
| parent | b7b2c34068f5541680315dcb7741a215a36dfd9f (diff) | |
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@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
(cherry picked from commit f37d11cd96ba15b40a497d4d7bdd14a77ea9b476)
| -rwxr-xr-x | test/scripts/xwayland-piglit.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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=$? |