.github: move some build & test pieces from pipeline to script

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.github/scripts/install-prereq.sh

@@ -18,6 +18,3 @@ build_meson   xorgproto         $(fdo_mirror xorgproto)                    xorgp
 build_ac_xts  xts               $(fdo_mirror xts)                          6cf94400a09abecd6b86e4eb6441741acecd51f6
 
 clone_source piglit             $(fdo_mirror piglit)                       59111996534f875ca88bce51f21fa2e6564895da
-
-echo '[xts]' > piglit/piglit.conf
-echo "path=$X11_BUILD_DIR/xts" >> piglit/piglit.conf

.github/scripts/run-xserver-build-and-test.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+if [ ! "$X11_BUILD_DIR" ]; then
+    echo "missing X11_BUILD_DIR" >&2
+    exit 1
+fi
+
+if [ ! "$MESON_BUILDDIR" ]; then
+    echo "missing MESON_BUILDDIR" >&2
+    exit 1
+fi
+
+echo "=== X11_BUILD_DIR=$X11_BUILD_DIR"
+echo "=== MESON_BUILDDIR=$MESON_BUILDDIR"
+
+.github/scripts/meson-build.sh
+
+echo '[xts]' > $X11_BUILD_DIR/piglit/piglit.conf
+echo "path=$X11_BUILD_DIR/xts" >> $X11_BUILD_DIR/piglit/piglit.conf
+
+meson test -C "$MESON_BUILDDIR" --print-errorlogs

.github/workflows/build-xserver.yml

@@ -54,11 +54,8 @@ jobs:
             - name: generic prereq
               run:  .github/scripts/install-prereq.sh
 
-            - name: build
+            - name: build and test
-              run:  .github/scripts/meson-build.sh
+              run:  .github/scripts/run-xserver-build-and-test.sh
-
-            - name: tests
-              run:  meson test -C "${{ env.MESON_BUILDDIR }}" --print-errorlogs
               env:
                   XTEST_DIR:  ${{ env.X11_BUILD_DIR }}/xts
                   PIGLIT_DIR: ${{ env.X11_BUILD_DIR }}/piglit