xserver: Branch 'master'

[Adam Jackson]

 test/scripts/xvfb-piglit.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95d3980c7c991b2cc8dcadac173635641ae15865
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Oct 5 17:29:36 2016 +0900

    test: Use $XSERVER_BUILDDIR for Xvfb executable path
    
    Fixes make check with out-of-tree builds.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/test/scripts/xvfb-piglit.sh b/test/scripts/xvfb-piglit.sh
index 799f285..763599e 100755
--- a/test/scripts/xvfb-piglit.sh
+++ b/test/scripts/xvfb-piglit.sh
@@ -1,4 +1,4 @@
-export SERVER_COMMAND="$XSERVER_DIR/hw/vfb/Xvfb \
+export SERVER_COMMAND="$XSERVER_BUILDDIR/hw/vfb/Xvfb \
         -noreset \
         -screen scrn 1280x1024x24"
 export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xvfb