Signed-off-by: Eric Anholt <e...@anholt.net>
---
test/Makefile.am | 6 ++++++
test/scripts/xephyr-glamor-piglit.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 35 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..9dd77695ba1d
--- /dev/null
+++ b/test/scripts/xephyr-glamor-piglit.sh
@@ -0,0 +1,29 @@
+# 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
+
+# The composite test is broken for reasons I haven't debugged yet:
+#
+# Beginning composite mask test on a8r8g8b8
+# Src composite test error of 255.0000 at (0, 0) --
+# R G B A
+# got: 0.000 0.000 0.000 0.000
+# expected: 1.000 1.000 1.000 1.000
+# src color: 1.00 1.00 1.00 1.00
+# msk color: 1.00 1.00 1.00 1.00
+# dst color: 1.00 1.00 1.00 1.00
+# src: 1x1R a8r8g8b8, mask: 1x1R x8r8g8b8, dst: a8r8g8b8
+export PIGLIT_ARGS="$PIGLIT_ARGS -x composite@all@x8r8g8b8"
+
+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
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
