Mesa (main): ci/softpipe: Move the flake to the flakes list.

[GitLab Mirror]

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

Author: Emma Anholt <emma at anholt.net>
Date:   Fri Jun 11 14:10:14 2021 -0700

ci/softpipe: Move the flake to the flakes list.

These flake annotations in the skips list predated having flakes support.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11333>

---

 src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt  | 1 +
 src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt | 1 +
 src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt  | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
index ae935d52d7f..1629c038230 100644
--- a/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
@@ -439,6 +439,7 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.blit_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.read_pixels_fbo_format_mismatch,Fail
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.read_pixels_fbo_format_mismatch,Fail
 dEQP-GLES31.functional.draw_base_vertex.draw_elements_instanced_base_vertex.line_loop.instanced_attributes,Fail
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.0,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.1,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.10,Fail
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
index 5d2d50b547c..0b92b692b82 100644
--- a/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
@@ -1,2 +1,3 @@
+dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask
 dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.geometry.isampler2darray
 dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.geometry.isampler3d
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
index 8d44847dd53..cde171173db 100644
--- a/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
@@ -1,8 +1,8 @@
 # Note: skips lists for CI are just a list of lines that, when
 # non-zero-length and not starting with '#', will regex match to
 # delete lines from the test list.  Be careful.
-# Random failures
-dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask
+
+# Consistent timeouts.
 dEQP-GLES31.functional.fbo.no_attachments.maximums.all
 dEQP-GLES31.functional.fbo.no_attachments.maximums.size