From 775cd85ed3fa632f1592ec816da2b723d8ea9ce9 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 4 Jun 2025 11:06:32 +0200
Subject: [PATCH] ci/android: Add a version and renderer check for
 android-angle-lavapipe

Add one GLES 2 test to run in the deqp-runner suite of the
android-angle-lavapipe job to verify the version and renderer used.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35337>
---
 .gitlab-ci/android-deqp-runner.sh                |  2 ++
 .../lavapipe/ci/deqp-android-angle-lavapipe.toml | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/.gitlab-ci/android-deqp-runner.sh b/.gitlab-ci/android-deqp-runner.sh
index 8d563793b37..770888fafc6 100755
--- a/.gitlab-ci/android-deqp-runner.sh
+++ b/.gitlab-ci/android-deqp-runner.sh
@@ -9,6 +9,8 @@
 $ADB shell mkdir -p /data/deqp
 $ADB push /deqp-gles/modules/egl/deqp-egl-android /data/deqp
 $ADB push /deqp-gles/mustpass/egl-main.txt.zst /data/deqp
+$ADB push /deqp-gles/modules/gles2/deqp-gles2 /data/deqp
+$ADB push /deqp-gles/mustpass/gles2-main.txt.zst /data/deqp
 $ADB push /deqp-vk/external/vulkancts/modules/vulkan/* /data/deqp
 $ADB push /deqp-vk/mustpass/vk-main.txt.zst /data/deqp
 $ADB push /deqp-tools/* /data/deqp
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml b/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
index cb91db002ad..6a6505a645c 100644
--- a/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
+++ b/src/gallium/frontends/lavapipe/ci/deqp-android-angle-lavapipe.toml
@@ -1,3 +1,19 @@
+# Run one GLES 2 test to check the version and renderer
+[[deqp]]
+deqp = "/data/deqp/deqp-gles2"
+caselists = ["/data/deqp/gles2-main.txt"]
+include = [ "dEQP-GLES2.info.renderer" ]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+version_check = "GL ES 3.1.*ANGLE 2.1.1 git"
+renderer_check = "ANGLE.*llvmpipe"
+
+# Basic EGL test set
 [[deqp]]
 deqp = "/data/deqp/deqp-egl-android"
 caselists = ["/data/deqp/egl-main.txt"]