Mesa (main): gitlab-ci: enable building of Vulkan tests in Piglit

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 2114f9e51d438f1c15f5ad9dbf9ecc2d17402138
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2114f9e51d438f1c15f5ad9dbf9ecc2d17402138

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Mon May 31 10:09:55 2021 +0300

gitlab-ci: enable building of Vulkan tests in Piglit

This is part of tackling a Piglit issue:
https://gitlab.freedesktop.org/mesa/piglit/-/issues/53

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10971>

---

 .gitlab-ci.yml                                        |  2 +-
 .gitlab-ci/container/x86_test-gl.sh                   |  3 ++-
 src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt | 11 -----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61260cf7f42..2e652d1ba47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -415,7 +415,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2021-05-25-apitrace"
+    MESA_IMAGE_TAG: &x86_test-gl "2021-05-31-piglit-vk"
 
 # Debian 11 based x86 test image for VK
 x86_test-vk:
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 9ff838f5ce0..e814aa1a138 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -13,6 +13,7 @@ STABLE_EPHEMERAL=" \
       clang-11 \
       cmake \
       g++ \
+      glslang-tools \
       libclang-cpp11-dev \
       libgbm-dev \
       libgles2-mesa-dev \
@@ -70,7 +71,7 @@ apt-get install -y --no-remove \
 
 ############### Build piglit
 
-PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_VK_TESTS=OFF" . .gitlab-ci/container/build-piglit.sh
+PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP GL
 
diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
index 900d15c8f2a..556f859cdd5 100644
--- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
@@ -93,17 +93,6 @@ spec at egl 1.4 at eglterminate then unbind context,Fail
 spec at egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
 spec at egl_khr_surfaceless_context@viewport,Fail
 spec at egl_mesa_configless_context@basic,Fail
-spec at ext_external_objects@vk-buf-exchange,Fail
-spec at ext_external_objects@vk-depth-display,Fail
-spec at ext_external_objects@vk-image-display,Fail
-spec at ext_external_objects@vk-image-display-overwrite,Fail
-spec at ext_external_objects@vk-image-overwrite,Fail
-spec at ext_external_objects@vk-pix-buf-update-errors,Fail
-spec at ext_external_objects@vk-semaphores-2,Fail
-spec at ext_external_objects@vk-semaphores,Fail
-spec at ext_external_objects@vk-stencil-display,Fail
-spec at ext_external_objects@vk-vert-buf-reuse,Fail
-spec at ext_external_objects@vk-vert-buf-update-errors,Fail
 spec at ext_framebuffer_blit@fbo-blit-check-limits,Fail
 spec at ext_framebuffer_multisample@blit-mismatched-formats,Fail
 spec at ext_framebuffer_multisample@clip-and-scissor-blit 2 msaa,Fail