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

Author: Emma Anholt <[email protected]>
Date:   Thu Apr 13 17:12:19 2023 -0700

ci: Move some timeout xfails to skips.

We generally don't want to wait around for a minute for things to fail.
Note that some of these were already in their skips.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495>

---

 src/amd/ci/radv-raven-fails.txt                         | 2 --
 src/amd/ci/radv-raven-skips.txt                         | 2 ++
 src/freedreno/ci/freedreno-a618-fails.txt               | 1 -
 src/freedreno/ci/freedreno-a630-fails.txt               | 1 -
 src/gallium/drivers/i915/ci/i915-g33-fails.txt          | 1 -
 src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt      | 1 -
 src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt  | 1 -
 src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt  | 2 ++
 src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt | 1 -
 src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt | 3 +++
 10 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/amd/ci/radv-raven-fails.txt b/src/amd/ci/radv-raven-fails.txt
index 557c980485c..2f0d9d71779 100644
--- a/src/amd/ci/radv-raven-fails.txt
+++ b/src/amd/ci/radv-raven-fails.txt
@@ -33,8 +33,6 @@ 
dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_vert_buffers1_sets3_im
 
dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_vert_buffers2_sets4_imm_samplers,Crash
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed49_tessellation,Fail
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed59_geometry,Fail
-dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap,Timeout
-dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap,Timeout
 
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r16_uint,Fail
 
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r4g4b4a4_unorm_pack16,Fail
 
dEQP-VK.ycbcr.plane_view.memory_alias.g16_b16r16_2plane_420_unorm_plane_0_compatible_format_r8g8_uint,Fail
diff --git a/src/amd/ci/radv-raven-skips.txt b/src/amd/ci/radv-raven-skips.txt
index 7310ba8a041..f2a9f8a6231 100644
--- a/src/amd/ci/radv-raven-skips.txt
+++ b/src/amd/ci/radv-raven-skips.txt
@@ -1,2 +1,4 @@
 # timeout
+dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap
+dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap
 dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt 
b/src/freedreno/ci/freedreno-a618-fails.txt
index 24e5d51da7e..48f27e99605 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -302,7 +302,6 @@ spec@!opengl [email protected],Fail
 spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@pbo@test_polygon_stip,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
-spec@!opengl 3.0@clearbuffer-depth-cs-probe,Timeout
 spec@!opengl [email protected] cull-back pv-first,Fail
 spec@!opengl [email protected] cull-front pv-first,Fail
 spec@!opengl [email protected] line cull-back pv-first,Fail
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt 
b/src/freedreno/ci/freedreno-a630-fails.txt
index 1ffe4a56c41..4cd3b529e81 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -308,7 +308,6 @@ spec@!opengl [email protected],Fail
 spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@pbo@test_polygon_stip,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
-spec@!opengl 3.0@clearbuffer-depth-cs-probe,Timeout
 spec@!opengl [email protected] cull-back pv-first,Fail
 spec@!opengl [email protected] cull-front pv-first,Fail
 spec@!opengl [email protected] line cull-back pv-first,Fail
diff --git a/src/gallium/drivers/i915/ci/i915-g33-fails.txt 
b/src/gallium/drivers/i915/ci/i915-g33-fails.txt
index e450f4d3782..4e8b17133f3 100644
--- a/src/gallium/drivers/i915/ci/i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/i915-g33-fails.txt
@@ -388,7 +388,6 @@ spec@arb_framebuffer_object@fbo-generatemipmap-cubemap 
s3tc_dxt1,Fail
 spec@arb_framebuffer_object@framebuffer-blit-levels draw stencil,Fail
 spec@arb_framebuffer_object@framebuffer-blit-levels read stencil,Fail
 
spec@arb_framebuffer_object@same-attachment-glframebuffertexture2d-gl_depth_stencil_attachment,Fail
-spec@arb_internalformat_query2@all internalformat_<x>_type pname checks,Timeout
 
 # Need to be able to report 0 OQ bits, since there are no HW OQs.
 spec@arb_occlusion_query2@render,Fail
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt 
b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
index 105f4302083..e4fca543b67 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -1,5 +1,4 @@
 
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.compute,Fail
-dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.fragment,Timeout
 
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex,Fail
 
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex_and_fragment,Fail
 
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.compute,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt 
b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
index 68a0bc73026..0b2308ed532 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
@@ -299,7 +299,6 @@ 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_si
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_size_via_sampler,Fail
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_image,Fail
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_sampler,Fail
-spec@egl_nok_texture_from_pixmap@basic,Timeout
 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_yvu420,Fail
 
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt 
b/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt
index bc9fbffd87d..1f8d0589f04 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt
@@ -7,6 +7,8 @@ spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64
 # Kopper regression
 glx@glx-tfp
 
+spec@egl_nok_texture_from_pixmap@basic
+
 # Exclude GLX tests.
 glx@glx*
 
diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt 
b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
index ead2f1461ba..d3b7d2cc1e5 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
@@ -296,7 +296,6 @@ 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_si
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_size_via_sampler,Fail
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_image,Fail
 
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_size_via_sampler,Fail
-spec@egl_nok_texture_from_pixmap@basic,Timeout
 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_yvu420,Fail
 
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt 
b/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt
index bc9fbffd87d..750fd93bcfd 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt
@@ -7,6 +7,9 @@ spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64
 # Kopper regression
 glx@glx-tfp
 
+spec@egl_nok_texture_from_pixmap@basic
+
+
 # Exclude GLX tests.
 glx@glx*
 

Reply via email to