frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Handle srcdir != builddir in Xvfb testing 

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2016-09-25 13:30:16 -07:00 committed by Adam Jackson
parent add4979260
commit 8d5e0c07b9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/Makefile.am
View File

@ -26,7 +26,8 @@ TESTS = \
$(NULL) $(NULL)
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
XSERVER_DIR=$(abs_top_builddir) \ XSERVER_DIR=$(abs_top_srcdir) \
XSERVER_BUILDDIR=$(abs_top_builddir) \
$(XORG_MALLOC_DEBUG_ENV) \ $(XORG_MALLOC_DEBUG_ENV) \
$(NULL) $(NULL)

8
test/scripts/xvfb-piglit.sh
View File

@ -20,12 +20,18 @@ if test "x$XSERVER_DIR" = "x"; then
exit 1 exit 1
fi fi
if test "x$XSERVER_BUILDDIR" = "x"; then
echo "XSERVER_BUILDDIR must be set to the build directory of the xserver repository."
# Exit as a real failure because it should always be set.
exit 1
fi
export PIGLIT_RESULTS_DIR=$PIGLIT_DIR/results/xvfb export PIGLIT_RESULTS_DIR=$PIGLIT_DIR/results/xvfb
startx \ startx \
$XSERVER_DIR/test/scripts/xinit-piglit-session.sh \ $XSERVER_DIR/test/scripts/xinit-piglit-session.sh \
-- \ -- \
$XSERVER_DIR/hw/vfb/Xvfb \ $XSERVER_BUILDDIR/hw/vfb/Xvfb \
-noreset \ -noreset \
-screen scrn 1280x1024x24 -screen scrn 1280x1024x24