diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/meson.build | 13 | ||||
| -rwxr-xr-x | test/scripts/xwayland-piglit.sh | 43 |
3 files changed, 0 insertions, 62 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 1f797530c..ce07c3551 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -25,14 +25,9 @@ endif endif endif -if XWAYLAND -XWAYLAND_TESTS = scripts/xwayland-piglit.sh -endif - SCRIPT_TESTS = \ $(XVFB_TESTS) \ $(XEPHYR_GLAMOR_TESTS) \ - $(XWAYLAND_TESTS) \ $(NULL) TESTS = tests \ @@ -193,7 +188,6 @@ EXTRA_DIST = \ scripts/xvfb-piglit.sh \ scripts/xephyr-glamor-piglit.sh \ scripts/xinit-piglit-session.sh \ - scripts/xwayland-piglit.sh \ scripts/run-piglit.sh \ $(NULL) diff --git a/test/meson.build b/test/meson.build index 4a79394e4..beeeaf840 100644 --- a/test/meson.build +++ b/test/meson.build @@ -100,19 +100,6 @@ if get_option('xvfb') endif endif -if build_xwayland - xwayland_args = [ - xwayland_server.full_path(), - ] - - test('XTS', - find_program('scripts/xwayland-piglit.sh'), - env: piglit_env, - timeout: 1200, - suite: 'xwayland' - ) -endif - subdir('bigreq') subdir('damage') subdir('sync') diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh deleted file mode 100755 index f0bb9727b..000000000 --- a/test/scripts/xwayland-piglit.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -e - -# this times out on Travis, because the tests take too long. -if test "x$TRAVIS_BUILD_DIR" != "x"; then - exit 77 -fi - -# Weston requires XDG_RUNTIME_DIR -if test "x$XDG_RUNTIME_DIR" = "x"; then - export XDG_RUNTIME_DIR=$(mktemp -d) -fi - -# Skip if weston isn't available -weston --version >/dev/null || exit 77 - -weston --no-config --backend=headless-backend.so --socket=wayland-$$ & -WESTON_PID=$! -export WAYLAND_DISPLAY=wayland-$$ - -# Wait for weston to initialize before starting Xwayland -timeout --preserve-status 60s bash -c 'while ! weston-info &>/dev/null; do sleep 1; done' - -# Start an Xwayland server -export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xwayland -export SERVER_COMMAND="$XSERVER_BUILDDIR/hw/xwayland/Xwayland -noreset" - -# Make sure glamor doesn't use HW acceleration -export GBM_ALWAYS_SOFTWARE=1 - -# Tests that currently fail on llvmpipe on CI -PIGLIT_ARGS="$PIGLIT_ARGS -x xcleararea@6" -PIGLIT_ARGS="$PIGLIT_ARGS -x xcleararea@7" -PIGLIT_ARGS="$PIGLIT_ARGS -x xclearwindow@4" -PIGLIT_ARGS="$PIGLIT_ARGS -x xclearwindow@5" -PIGLIT_ARGS="$PIGLIT_ARGS -x xcopyarea@1" - -export PIGLIT_ARGS - -$XSERVER_DIR/test/scripts/run-piglit.sh -PIGLIT_STATUS=$? - -kill $WESTON_PID -exit $PIGLIT_STATUS |