From 209a347a8c3341318981cd5bf64d7792c19542d0 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 6 Jul 2023 17:29:00 +0100 Subject: [PATCH] zink/ci: fix skips & flakes for zink+radv on vangogh & navi10 These are regexes, not globs. Signed-off-by: Eric Engestrom Part-of: --- .../drivers/zink/ci/zink-radv-navi10-flakes.txt | 2 +- src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt | 10 +++++----- .../drivers/zink/ci/zink-radv-vangogh-flakes.txt | 2 +- .../drivers/zink/ci/zink-radv-vangogh-skips.txt | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt index 86b1401aace..f5199a6ad91 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt @@ -6,7 +6,7 @@ spec@!opengl 1.0@rasterpos spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=6 # need to handle non-fbfetch feedback loops -spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader* +spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader.* dEQP-GLES31.functional.copy_image.mixed.viewclass_128_bits_mixed.rgba32i_srgb8_alpha8_astc_12x10_khr.renderbuffer_to_cubemap dEQP-GLES31.functional.copy_image.mixed.viewclass_128_bits_mixed.srgb8_alpha8_astc_8x8_khr_rgba32ui.cubemap_to_cubemap 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 91d728b1189..717140784a1 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt @@ -1,4 +1,4 @@ -ext_texture_env* +ext_texture_env.* spec@arb_shader_image_load_store.invalid spec@arb_shader_image_load_store.max-size spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 @@ -10,7 +10,7 @@ glx@glx-tfp spec@egl_nok_texture_from_pixmap@basic # Exclude GLX tests. -glx@glx* +glx@glx.* # Tests below timeout most of the time. KHR-GL46.copy_image.functional @@ -22,10 +22,10 @@ KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_ spec@arb_texture_buffer_object@formats.*arb.* # These randomly hang. -spec@ext_external_objects@* +spec@ext_external_objects@.* # These are too random. -spec@arb_shader_clock@execution@clock* +spec@arb_shader_clock@execution@clock.* # These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp* +spec@arb_texture_buffer_object@texture-buffer-size-clamp.* diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt index 8305111446c..1d1b015f3df 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt @@ -5,7 +5,7 @@ spec@arb_shader_image_load_store@coherency spec@!opengl 1.0@rasterpos # need to handle non-fbfetch feedback loops -spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader* +spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader.* spec@!opengl 1.1@depthstencil-default_fb-blit samples=4 spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=2 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 1e7b4020d61..2238cb8d07e 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt @@ -1,4 +1,4 @@ -ext_texture_env* +ext_texture_env.* spec@arb_shader_image_load_store.invalid spec@arb_shader_image_load_store.max-size spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 @@ -11,7 +11,7 @@ spec@egl_nok_texture_from_pixmap@basic # Exclude GLX tests. -glx@glx* +glx@glx.* # Tests below timeout most of the time. KHR-GL46.copy_image.functional @@ -23,10 +23,10 @@ KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_ spec@arb_texture_buffer_object@formats.*arb.* # These randomly hang. -spec@ext_external_objects@* +spec@ext_external_objects@.* # These are too random. -spec@arb_shader_clock@execution@clock* +spec@arb_shader_clock@execution@clock.* # These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp* +spec@arb_texture_buffer_object@texture-buffer-size-clamp.*