hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-03 03:24:39 +00:00
Code Issues Projects Releases Wiki Activity

CI: use MESON_BUILDDIR for the build directory

Browse source 
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
This commit is contained in:
Peter Hutterer 2024-02-20 09:21:45 +10:00 • committed by Marge Bot
commit 0ab32a7587
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci/build-and-test.sh
View file

@ -3,10 +3,14 @@
set -e
set -o xtrace
if [[ -z "$MESON_BUILDDIR" ]]; then
MESON_BUILDDIR=build
fi
check_piglit_results ()
{
local EXPECTED_RESULTS=build/test/piglit-results/$1
local DEPENDENCY=build/$2
local EXPECTED_RESULTS="$MESON_BUILDDIR"/test/piglit-results/$1
local DEPENDENCY="$MESON_BUILDDIR"/$2
if ! test -e $DEPENDENCY; then
return
@ -20,11 +24,11 @@ check_piglit_results ()
exit 1
}
meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS "$MESON_BUILDDIR/"
export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts LP_NUM_THREADS=0
ninja -j${FDO_CI_CONCURRENT:-4} -C build/
meson test --num-processes ${FDO_CI_CONCURRENT:-4} --print-errorlogs -C build/
ninja -j${FDO_CI_CONCURRENT:-4} -C "$MESON_BUILDDIR/"
meson test --num-processes ${FDO_CI_CONCURRENT:-4} --print-errorlogs -C "$MESON_BUILDDIR/"
check_piglit_results xephyr-glamor hw/kdrive/ephyr/Xephyr.p/ephyr_glamor.c.o
check_piglit_results xvfb hw/vfb/Xvfb