From 76831b6344bba231f3fbc6978ae8c9c80dbc9940 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 17 Nov 2022 14:53:33 -0800 Subject: [PATCH] ci/freedreno: Add wayland testing using weston. Take the old EGL job and make it a suite, stop segregating the reset tests now that we assign reset blame appropriately, and add a variant using headless weston. This catches two failures we weren't covering before. Acked-by: David Heidelberg Part-of: --- src/freedreno/ci/deqp-freedreno-a630-egl.toml | 11 +++++++++++ src/freedreno/ci/freedreno-a630-fails.txt | 17 +++++++++++++++++ src/freedreno/ci/gitlab-ci.yml | 2 ++ 3 files changed, 30 insertions(+) diff --git a/src/freedreno/ci/deqp-freedreno-a630-egl.toml b/src/freedreno/ci/deqp-freedreno-a630-egl.toml index 88972aea524..5e583a2f819 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-egl.toml +++ b/src/freedreno/ci/deqp-freedreno-a630-egl.toml @@ -8,3 +8,14 @@ deqp_args = [ "--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"] +skips = ["install/freedreno-a630-premerge-skips.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/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 4f3c520155b..a1b7d7603ca 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -460,3 +460,20 @@ gmem-dEQP-VK.pipeline.fast_linked_library.color_write_enable_maxa.cwe_after_bind # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail + +# EGL_BAD_DISPLAY is generated if display is not an EGL display connection +# eglCreatePixmapSurface(0, 0x0000000000000000, 0x0000000000000000, { EGL_NONE }); +# // 0x0000000000000000 returned +# eglCreatePixmapSurface(0xffffffffffffffff, 0x0000000000000000, 0x0000000000000000, { EGL_NONE }); +# // 0x0000000000000000 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(0xaaab01f31100, 0xffffffffffffffff, 0x0000000000000000, { EGL_NONE }); +# // 0x0000000000000000 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 +# Excerpt: +# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 +# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 +# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 +# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3 +wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 1342d53e189..56c92e0eb48 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -197,6 +197,7 @@ a630_gl: DEQP_SUITE: freedreno-a630 # Run dEQP EGL window system tests separately with the window systems available. +# X11 takes over the screen, wayland is run headless. a630_egl: extends: - .baremetal-deqp-test @@ -204,6 +205,7 @@ a630_egl: variables: DEQP_VER: egl HWCI_START_XORG: 1 + HWCI_START_WESTON: 1 DEQP_SUITE: freedreno-a630-egl a630_gles_asan: