summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-09-25 13:30:22 -0700
committerAdam Jackson <ajax@redhat.com>2016-09-28 12:44:51 -0400
commitc49e820f796c27cbd2907709576a3fb672acd453 (patch)
treeb94ef029dfbdbb123f6878eebf412f1fe71643af
parent5392ea5525082ceeb3aad50d9168baee2abc860e (diff)
test: Run xts against Xephyr -glamor when present
v2: Drop x8r8g8b8 skip, now that it's fixed. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--test/Makefile.am6
-rwxr-xr-xtest/scripts/xephyr-glamor-piglit.sh16
2 files changed, 22 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index cf19beca9..c89915c41 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 000000000..51d42c313
--- /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