From 0ab32a7587686f28e20c0a8e1a212a5a85052ee7 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 20 Feb 2024 09:21:45 +1000
Subject: [PATCH] CI: use MESON_BUILDDIR for the build directory

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
---
 .gitlab-ci.yml               | 13 +++++++------
 .gitlab-ci/build-and-test.sh | 14 +++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30f1e208a..99059c569 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
     FDO_DISTRIBUTION_VERSION: bullseye-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
     FDO_DISTRIBUTION_TAG: "2023-06-20-libei.0"
+    MESON_BUILDDIR: "build"
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -60,8 +61,8 @@ debian-bullseye:
     artifacts:
         when: always
         paths:
-            - build/meson-logs/
-            - build/test/piglit-results/
+            - $MESON_BUILDDIR/meson-logs/
+            - $MESON_BUILDDIR/test/piglit-results/
     variables:
         CCACHE_COMPILERCHECK: content
         CCACHE_DIR: /cache/xserver/cache
@@ -94,16 +95,16 @@ meson-nolibdecor:
 mingw-cross-build:
     extends: .common-build-and-test
     script:
-        - meson --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true build/
-        - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install
+        - meson --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true $MESON_BUILDDIR/
+        - ninja -j${FDO_CI_CONCURRENT:-4} -C $MESON_BUILDDIR/ install
 
 meson-dist:
     extends: .common-build-and-test
     artifacts:
         when: always
         paths:
-            - build/meson-logs/
-            - build/xserver-*/build/meson-logs/
+            - $MESON_BUILDDIR/meson-logs/
+            - $MESON_BUILDDIR/xserver-*/$MESON_BUILDDIR/meson-logs/
     script:
         - .gitlab-ci/dist.sh
 
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