diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2024-02-20 09:21:45 +1000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-02-29 01:27:02 +0000 |
| commit | 0ab32a7587686f28e20c0a8e1a212a5a85052ee7 (patch) | |
| tree | 2a8cca1384b699fc94fde12d235eadb1142bde11 /.gitlab-ci | |
| parent | ceb60b0cda12563823dd3cf0e59c438ca9323dc0 (diff) | |
CI: use MESON_BUILDDIR for the build directory
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/build-and-test.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab-ci/build-and-test.sh b/.gitlab-ci/build-and-test.sh index b0fbf90d5..346c9d739 100755 --- a/.gitlab-ci/build-and-test.sh +++ b/.gitlab-ci/build-and-test.sh @@ -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 |