summaryrefslogtreecommitdiff
path: root/test/scripts
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-09-25 13:30:21 -0700
committerAdam Jackson <ajax@redhat.com>2016-09-28 12:44:46 -0400
commit5392ea5525082ceeb3aad50d9168baee2abc860e (patch)
treec62175a7977ccb5e893443175715f303ca1c0cf2 /test/scripts
parent283840c295c69aa3729f3f0aa2bf3ef83b1c220f (diff)
test: Switch our testing X server to being spawned with simple-xinit
Once I introduced a second X server being tested, I found that startx hit races in choosing a display. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'test/scripts')
-rwxr-xr-xtest/scripts/run-piglit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh
index 3623a05c1..b999c2598 100755
--- a/test/scripts/run-piglit.sh
+++ b/test/scripts/run-piglit.sh
@@ -38,7 +38,7 @@ if test "x$SERVER_COMMAND" = "x"; then
exit 1
fi
-startx \
+$XSERVER_BUILDDIR/test/simple-xinit \
$XSERVER_DIR/test/scripts/xinit-piglit-session.sh \
-- \
$SERVER_COMMAND