From 98b36e02b9c44f56263394465d37ee2802384440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= <pavel.ondracka@gmail.com>
Date: Sun, 4 Feb 2024 21:19:37 +0100
Subject: [PATCH] ci: build nine tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Reviewed-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Reviewed-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27434>
---
 .gitlab-ci/container/build-ninetests.sh       | 25 +++++++++++++++++++
 .gitlab-ci/container/debian/x86_64_test-gl.sh |  8 ++++++
 .gitlab-ci/image-tags.yml                     |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .gitlab-ci/container/build-ninetests.sh

diff --git a/.gitlab-ci/container/build-ninetests.sh b/.gitlab-ci/container/build-ninetests.sh
new file mode 100644
index 00000000000..d60b5fe8261
--- /dev/null
+++ b/.gitlab-ci/container/build-ninetests.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_GL_TAG
+
+set -ex -o pipefail
+
+### Careful editing anything below this line
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone https://github.com/axeldavy/Xnine.git /Xnine
+mkdir /Xnine/build
+pushd /Xnine/build
+git checkout c64753d224c08006bcdcfa7880ada826f27164b1
+
+cmake .. -DBUILD_TESTS=1 -DWITH_DRI3=1 -DD3DADAPTER9_LOCATION=/install/lib/d3d/d3dadapter9.so
+make
+
+mkdir -p /NineTests/
+mv NineTests/NineTests /NineTests/
+
+popd
+rm -rf /Xnine
diff --git a/.gitlab-ci/container/debian/x86_64_test-gl.sh b/.gitlab-ci/container/debian/x86_64_test-gl.sh
index 91a7f40fe80..d5bafd3229a 100644
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh
@@ -22,6 +22,7 @@ EPHEMERAL=(
     "libclang-cpp${LLVM_VERSION}-dev"
     libdrm-dev
     libgles2-mesa-dev
+    libgtest-dev
     libpciaccess-dev
     libpng-dev
     libudev-dev
@@ -30,6 +31,9 @@ EPHEMERAL=(
     libwayland-dev
     libx11-xcb-dev
     libxcb-dri2-0-dev
+    libxcb-dri3-dev
+    libxcb-present-dev
+    libxfixes-dev
     libxkbcommon-dev
     libxrandr-dev
     libxrender-dev
@@ -94,6 +98,10 @@ DEQP_TARGET=surfaceless \
 
 . .gitlab-ci/container/build-vulkan-validation.sh
 
+############### Build nine tests
+
+. .gitlab-ci/container/build-ninetests.sh
+
 ############### Uninstall the build software
 
 apt-get purge -y "${EPHEMERAL[@]}"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 8fe5c205091..58d7ed1e273 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -25,7 +25,7 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_X86_64_TEST_ANDROID_TAG: "20240311-runner"
-   DEBIAN_X86_64_TEST_GL_TAG: "20240311-runner"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240313-ninetests"
    DEBIAN_X86_64_TEST_VK_TAG: "20240311-runner"
    KERNEL_ROOTFS_TAG: "20240311-runner"