Mesa (main): iris/ci: Fix piglit tests expectations on amly

[GitLab Mirror]

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

Author: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Date:   Tue Jan 18 09:43:15 2022 +0200

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 at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14413>

---

 src/gallium/drivers/iris/ci/iris-amly-fails.txt  | 4 ----
 src/gallium/drivers/iris/ci/iris-amly-flakes.txt | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/iris/ci/iris-amly-fails.txt b/src/gallium/drivers/iris/ci/iris-amly-fails.txt
index e90d84e59e2..ddcd52b5eff 100644
--- 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 at arb_shader_texture_lod@execution at arb_shader_texture_lod-texgradcube,Fail
 # error: main:90: eglChooseConfig() returned no configs
 spec at egl 1.4 at eglterminate then unbind context,Fail
 
-spec at egl_chromium_sync_control@conformance,Fail
-# piglit: error: SBC did not change after second SwapBuffers: 0
-spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail
-
 # test binary not built
 spec at 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 dd256ecbfd8..9c545965ebf 100644
--- 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 at arb_query_buffer_object@qbo at query-.*
 #   spec at arb_query_buffer_object@qbo at query-GL_VERTEX_SHADER_INVOCATIONS-ASYNC_CPU_READ_AFTER-GL_UNSIGNED_INT64_ARB
 #   spec at arb_query_buffer_object@qbo at query-GL_TIMESTAMP-ASYNC_CPU_READ_BEFORE-GL_UNSIGNED_INT
 spec at arb_query_buffer_object@qbo at query-.*
+
+# The tests below are not actually detected as flaky, but they do behave as such
+spec at egl_chromium_sync_control@conformance
+spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_msc_and_sbc_test