xserver: Branch 'master'

[Adam Jackson]

 test/Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b365c5d16894a259dbf29db4ca2640d8ed768063
Author: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
Date:   Wed Dec 7 15:43:06 2016 +0200

    test: fix distributing scripts
    
    Fix the following error on 'make distcheck':
    
    make[6]: *** No rule to make target 'scripts/xvfb-piglit.sh', needed by 'scripts/xvfb-piglit.sh.log'.  Stop.
    make[6]: Leaving directory '/home/pq/git/xserver/xorg-server-1.19.99.1/_build/sub/test'
    Makefile:1367: recipe for target 'check-TESTS' failed
    
    The setup to trigger this is:
      $ ./configure --prefix=/home/pq/local --disable-docs
      --disable-devel-docs --enable-xwayland --disable-xorg --disable-xvfb
      --disable-xnest --disable-xquartz --disable-xwin --enable-debug
    
    SCRIPT_TESTS is populated conditionally, but we should distribute the
    scripts in any case.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index b8a0f4d..064e1c5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -166,7 +166,8 @@ libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
 endif
 
 EXTRA_DIST = \
-	$(SCRIPT_TESTS) \
+	scripts/xvfb-piglit.sh \
+	scripts/xephyr-glamor-piglit.sh \
 	scripts/xinit-piglit-session.sh \
 	scripts/run-piglit.sh \
 	ddxstubs.c \