[PATCH xserver v3 11/11] test: Run xts against Xephyr -glamor when present.

[Eric Anholt]

v2: Drop x8r8g8b8 skip, now that it's fixed.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 test/Makefile.am                     |  6 ++++++
 test/scripts/xephyr-glamor-piglit.sh | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 test/scripts/xephyr-glamor-piglit.sh

diff --git a/test/Makefile.am b/test/Makefile.am
index cf19beca96ff..c89915c41348 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,10 +19,16 @@ noinst_PROGRAMS = \
 
 if XVFB
 XVFB_TESTS = scripts/xvfb-piglit.sh
+if XEPHYR
+if GLAMOR
+XEPHYR_GLAMOR_TESTS = scripts/xephyr-glamor-piglit.sh
+endif
+endif
 endif
 
 SCRIPT_TESTS = \
 	$(XVFB_TESTS) \
+	$(XEPHYR_GLAMOR_TESTS) \
 	$(NULL)
 
 TESTS = \
diff --git a/test/scripts/xephyr-glamor-piglit.sh b/test/scripts/xephyr-glamor-piglit.sh
new file mode 100755
index 000000000000..51d42c313643
--- /dev/null
+++ b/test/scripts/xephyr-glamor-piglit.sh
@@ -0,0 +1,16 @@
+# Start a Xephyr server using glamor.  Since the test environment is
+# headless, we start an Xvfb first to host the Xephyr.
+export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xephyr-glamor
+
+export SERVER_COMMAND="$XSERVER_BUILDDIR/hw/kdrive/ephyr/Xephyr \
+        -glamor \
+        -glamor-skip-present \
+        -noreset \
+        -schedMax 2000 \
+        -screen 1280x1024"
+
+$XSERVER_BUILDDIR/test/simple-xinit \
+        $XSERVER_DIR/test/scripts/run-piglit.sh \
+        -- \
+        $XSERVER_BUILDDIR/hw/vfb/Xvfb \
+        -screen scrn 1280x1024x24
-- 
2.9.3