ci: Uprev piglit to b3a9fa345 ("framework/replay: Quote resource names before signing")

The PIGLIT_BUILD_CL_TESTS related changes were shamelessly stolen from
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6441/diffs?commit_id=5742be00e6b493b5289ed8120eb06f10d341ea3a.

v2: Remove glslang-tools from arm_build.sh.  Suggested by Michel.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10492>
This commit is contained in:
Ian Romanick 2021-04-27 12:27:31 -07:00 committed by Marge Bot
parent 1e3981f69c
commit 3572e24e74
12 changed files with 58 additions and 20 deletions

View File

@ -413,13 +413,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-gl "2021-04-20-gles-khr"
MESA_IMAGE_TAG: &x86_test-gl "2021-04-28-yuv-3"
# Debian 11 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-04-20-gles-khr"
MESA_IMAGE_TAG: &x86_test-vk "2021-04-28-yuv-3"
# Debian 11 based ARM build image
arm_build:
@ -447,7 +447,7 @@ arm_build:
variables:
GIT_STRATEGY: fetch
KERNEL_URL: "https://gitlab.freedesktop.org/drm/msm/-/archive/v5.11-for-mesa-ci-40abe2528d16/linux-v5.11-for-mesa-ci-40abe2528d16.tar.bz2"
MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-27-msm-fixes"
MESA_ROOTFS_TAG: &kernel-rootfs "2021-04-28-yuv-3"
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
script:
- .gitlab-ci/container/lava_build.sh

View File

@ -2,13 +2,9 @@
set -ex
if [ -n "$INCLUDE_OPENCL_TESTS" ]; then
PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON"
fi
git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
pushd /piglit
git checkout 6a4be9e9946df310d9402f995f371c7deb8c27ba
git checkout b3a9fa345d87331ff0a5819436ce7603e34ee9bb
patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
ninja $PIGLIT_BUILD_TARGETS

View File

@ -73,6 +73,7 @@ apt-get install -y --no-remove \
cmake \
debootstrap \
git \
glslang-tools \
libegl1-mesa-dev \
libgbm-dev \
libgles2-mesa-dev \

View File

@ -70,7 +70,7 @@ apt-get install -y --no-remove \
############### Build piglit
INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh
PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_VK_TESTS=OFF" . .gitlab-ci/container/build-piglit.sh
############### Build dEQP GL

View File

@ -10,6 +10,7 @@ STABLE_EPHEMERAL=" \
ccache \
cmake \
g++ \
glslang-tools \
libgbm-dev \
libgles2-mesa-dev \
liblz4-dev \

View File

@ -227,7 +227,6 @@ spec@ext_framebuffer_object@fbo-stencil-gl_stencil_index8-copypixels,Fail
spec@ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail
spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
@ -247,16 +246,11 @@ spec@ext_render_snorm@render,Fail
spec@ext_texture_integer@fbo-integer,Fail
spec@ext_texture_snorm@fbo-blending-formats,Fail
spec@ext_transform_feedback2@draw-auto,Fail
spec@ext_transform_feedback@change-size base-shrink,Fail
spec@ext_transform_feedback@change-size offset-shrink,Fail
spec@ext_transform_feedback@change-size range-shrink,Fail
spec@ext_transform_feedback@discard-copypixels,Fail
spec@ext_transform_feedback@generatemipmap prims_generated,Fail
spec@ext_transform_feedback@immediate-reuse,Fail
spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail
spec@ext_transform_feedback@immediate-reuse-uniform-buffer,Fail
spec@ext_transform_feedback@overflow-edge-cases,Fail
spec@ext_transform_feedback@query-primitives_written-bufferrange-discard,Fail
spec@ext_transform_feedback@tessellation line_loop flat_first,Fail
spec@ext_transform_feedback@tessellation line_loop flat_last,Fail
spec@ext_transform_feedback@tessellation line_loop monochrome,Fail
@ -343,8 +337,8 @@ spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
wgl@wgl-multi-context-single-window,Fail
wgl@wgl-multi-window-single-context,Fail
wgl@wgl-sanity,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-other-flat-vertex,Fail
spec@glsl-1.30@execution@clipping@fs-clip-distance-interpolated,Crash
spec@glsl-1.30@execution@fs-large-local-array-vec2,Crash
spec@glsl-1.30@execution@fs-large-local-array-vec3,Crash
spec@glsl-1.30@execution@fs-large-local-array-vec4,Crash
spec@glsl-1.30@execution@range_analysis_fsat_of_nan,Fail

View File

@ -267,9 +267,6 @@ spec@ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail
spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail
spec@ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail
spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail
spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail
spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail
spec@ext_packed_float@query-rgba-signed-components,Fail
@ -315,6 +312,7 @@ spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d,Crash
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Crash
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Crash
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Crash
spec@glsl-1.30@execution@range_analysis_fsat_of_nan,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Crash
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Crash
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Crash

View File

@ -894,6 +894,8 @@ spec/ext_external_objects/vk-image-display: skip
spec/ext_external_objects/vk-image-display-overwrite: skip
spec/ext_external_objects/vk-image-overwrite: skip
spec/ext_external_objects/vk-pix-buf-update-errors: skip
spec/ext_external_objects/vk-semaphores: skip
spec/ext_external_objects/vk-semaphores-2: skip
spec/ext_external_objects/vk-vert-buf-reuse: skip
spec/ext_external_objects/vk-vert-buf-update-errors: skip
spec/ext_external_objects_fd/memory-object-api-errors: skip
@ -1382,6 +1384,7 @@ spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_hints: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-missing_attributes: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-ownership_transfer: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-refcount: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-reimport-bug: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_argb8888: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_ayuv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_nv12: skip
@ -1391,6 +1394,12 @@ spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_p016: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_uyvy: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_xrgb8888: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_xyuv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y210: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y212: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y216: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y410: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y412: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y416: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yuv420: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yuyv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yvu420: skip

View File

@ -162,6 +162,7 @@ spec/glsl-1.20/execution/fs-nan-builtin-max: fail
spec/glsl-1.20/execution/fs-nan-builtin-min: fail
spec/glsl-1.20/execution/vs-nan-builtin-max: fail
spec/glsl-1.20/execution/vs-nan-builtin-min: fail
spec/glsl-1.30/execution/range_analysis_fsat_of_nan: fail
spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: skip
spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: skip
spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-different-from-position: skip
@ -227,7 +228,6 @@ spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec2-vec2: fail
spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec3-vec3: fail
spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec4-vec4: fail
spec/glsl-4.50/execution/ssbo-atomiccompswap-int: fail
spec/glsl-es-3.10/execution/fs-simple-atomic-counter-inc-dec-read: fail
spec/intel_shader_atomic_float_minmax/execution/shared-atomiccompswap-float: skip
spec/intel_shader_atomic_float_minmax/execution/shared-atomicexchange-float: skip
spec/intel_shader_atomic_float_minmax/execution/shared-atomicmax-float: skip

View File

@ -2,20 +2,32 @@ glx@glx-visuals-stencil -pixmap,Crash
glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
glx@glx_ext_import_context@get context id,Fail
glx@glx_ext_import_context@import context- single process,Fail
spec@arb_bindless_texture@illegal,Fail
spec@arb_direct_state_access@gettextureimage-formats,Crash
spec@arb_es2_compatibility@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail
spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail
spec@egl_chromium_sync_control@conformance,Fail
spec@egl_khr_surfaceless_context@viewport,Fail
spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail
spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_integer@fbo-integer,Fail
spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
wgl@wgl-sanity,Fail

View File

@ -1867,6 +1867,8 @@ spec/ext_external_objects/vk-image-display: skip
spec/ext_external_objects/vk-image-display-overwrite: skip
spec/ext_external_objects/vk-image-overwrite: skip
spec/ext_external_objects/vk-pix-buf-update-errors: skip
spec/ext_external_objects/vk-semaphores: skip
spec/ext_external_objects/vk-semaphores-2: skip
spec/ext_external_objects/vk-vert-buf-reuse: skip
spec/ext_external_objects/vk-vert-buf-update-errors: skip
spec/ext_external_objects_fd/memory-object-api-errors: skip
@ -2493,6 +2495,7 @@ spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_hints: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-missing_attributes: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-ownership_transfer: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-refcount: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-reimport-bug: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_argb8888: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_ayuv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_nv12: skip
@ -2502,6 +2505,12 @@ spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_p016: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_uyvy: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_xrgb8888: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_xyuv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y210: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y212: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y216: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y410: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y412: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_y416: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yuv420: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yuyv: skip
spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_yvu420: skip
@ -2684,6 +2693,7 @@ spec/glsl-1.10/execution/fs-dfdx-accuracy: warn
spec/glsl-1.10/execution/fs-dfdy-accuracy: warn
spec/glsl-1.10/preprocessor/extension-defined-test: skip
spec/glsl-1.10/preprocessor/extension-if-1: skip
spec/glsl-1.30/execution/range_analysis_fsat_of_nan: fail
spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1d: fail
spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1darray: fail
spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1darrayshadow: fail

View File

@ -111,6 +111,16 @@ spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
spec@egl_khr_surfaceless_context@viewport,Fail
spec@egl_mesa_configless_context@basic,Fail
spec@ext_external_objects@vk-buf-exchange,Fail
spec@ext_external_objects@vk-depth-display,Fail
spec@ext_external_objects@vk-image-display,Fail
spec@ext_external_objects@vk-image-display-overwrite,Fail
spec@ext_external_objects@vk-image-overwrite,Fail
spec@ext_external_objects@vk-pix-buf-update-errors,Fail
spec@ext_external_objects@vk-semaphores-2,Fail
spec@ext_external_objects@vk-semaphores,Fail
spec@ext_external_objects@vk-vert-buf-reuse,Fail
spec@ext_external_objects@vk-vert-buf-update-errors,Fail
spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
spec@ext_framebuffer_multisample@blit-mismatched-formats,Fail
spec@ext_framebuffer_multisample@clip-and-scissor-blit 2 msaa,Fail
@ -140,6 +150,7 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-reimport-bug,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_argb8888,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail
@ -149,6 +160,12 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail