ci/vc4,v3d: Add headless wayland testing using weston.

Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19912>

diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 1b3bbba..d687924 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi3-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi3-fails.txt
@@ -1203,3 +1203,21 @@ spec@oes_compressed_etc1_rgb8_texture@miptree,Fail
 spec@!opengl 1.0@depth-clear-precision-check,Fail
 spec@!opengl 1.0@depth-clear-precision-check@depth16,Fail
 spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
+
+# Creating OpenGL ES 2 context
+# Pass
+# Creating OpenGL ES 3 context
+# Fail, context: 0x00000000, error: EGL_BAD_MATCH
+# eglBindAPI(EGL_OPENVG_API) failed, skipping
+wayland-dEQP-EGL.functional.create_context.no_config,Fail
+
+# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
+# eglCreatePixmapSurface(0, 0x00000000, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# eglCreatePixmapSurface(0xffffffff, 0x00000000, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
+# eglCreatePixmapSurface(0x245b4d8, 0xffffffff, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
+wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail

diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index a1494fa..a0f0112 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -360,3 +360,14 @@ dEQP-VK.compute.workgroup_memory_explicit_layout.copy_memory.two_invocations,Cra
 dEQP-VK.compute.workgroup_memory_explicit_layout.zero_ext.block,Crash
 dEQP-VK.compute.workgroup_memory_explicit_layout.zero_ext.other_block,Crash
 dEQP-VK.compute.workgroup_memory_explicit_layout.zero_ext.block_with_offset,Crash
+
+# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
+# eglCreatePixmapSurface(0, 0x00000000, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# eglCreatePixmapSurface(0xffffffff, 0x00000000, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
+# eglCreatePixmapSurface(0xb1f4d8, 0xffffffff, 0x00000000, { EGL_NONE });
+# // 0x00000000 returned
+# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
+wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail

diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
new file mode 100644 (file)
index 0000000..1d4d593
--- /dev/null
+++ b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
@@ -0,0 +1,19 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"

diff --git a/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
new file mode 100644 (file)
index 0000000..1d4d593
--- /dev/null
+++ b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
@@ -0,0 +1,19 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"

diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index b52c4c7..fe86568 100644 (file)
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -26,8 +26,8 @@ vc4-rpi3-egl:armhf:
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     HWCI_START_XORG: 1
-    DEQP_RUNNER_OPTIONS: "--tests-per-group 250"
-    DEQP_VER: egl
+    HWCI_START_WESTON: 1
+    DEQP_SUITE: broadcom-rpi3-egl
 
 .vc4-rpi3-piglit:armhf:
   extends:
@@ -72,7 +72,8 @@ v3d-rpi4-egl:armhf:
     - .v3d-rpi4-test:armhf
   variables:
     HWCI_START_XORG: 1
-    DEQP_VER: egl
+    HWCI_START_WESTON: 1
+    DEQP_SUITE: broadcom-rpi4-egl
 
 v3d-rpi4-piglit:armhf:
   extends: