iris/ci: Fix piglit tests expectations on amly

Found two tests that started to show a flaky behavior, although they are
not detected as such by the test runner. Depending on their presence in
the 'fails' list, they are reported as "UnexpectedPass" or "Fail".

Let's fix this by moving them to the 'flaky' list.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14413>

diff --git a/src/gallium/drivers/iris/ci/iris-amly-fails.txt b/src/gallium/drivers/iris/ci/iris-amly-fails.txt
index e90d84e..ddcd52b 100644 (file)
--- a/src/gallium/drivers/iris/ci/iris-amly-fails.txt
+++ b/src/gallium/drivers/iris/ci/iris-amly-fails.txt
@@ -214,10 +214,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail
 # error: main:90: eglChooseConfig() returned no configs
 spec@egl 1.4@eglterminate then unbind context,Fail
 
-spec@egl_chromium_sync_control@conformance,Fail
-# piglit: error: SBC did not change after second SwapBuffers: 0
-spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail
-
 # test binary not built
 spec@egl_ext_protected_content@conformance,Fail
 

diff --git a/src/gallium/drivers/iris/ci/iris-amly-flakes.txt b/src/gallium/drivers/iris/ci/iris-amly-flakes.txt
index dd256ec..9c54596 100644 (file)
--- a/src/gallium/drivers/iris/ci/iris-amly-flakes.txt
+++ b/src/gallium/drivers/iris/ci/iris-amly-flakes.txt
@@ -14,3 +14,7 @@ spec@arb_query_buffer_object@qbo@query-.*
 #   spec@arb_query_buffer_object@qbo@query-GL_VERTEX_SHADER_INVOCATIONS-ASYNC_CPU_READ_AFTER-GL_UNSIGNED_INT64_ARB
 #   spec@arb_query_buffer_object@qbo@query-GL_TIMESTAMP-ASYNC_CPU_READ_BEFORE-GL_UNSIGNED_INT
 spec@arb_query_buffer_object@qbo@query-.*
+
+# The tests below are not actually detected as flaky, but they do behave as such
+spec@egl_chromium_sync_control@conformance
+spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test