[PATCH i-g-t v1 3/4] tests/intel/xe_wedged: Inform runner about expected error

[Zbigniew Kempczyński]

On Thu, Jul 25, 2024 at 02:50:05PM +0200, Kamil Konieczny wrote:
> Tests runs force wedged state and then driver emits an error.
> Standalone runs are succeeding but when run by igt runner it
> catch such errors and reports them in results.
> 
> Inform runner to ignore such triggered failure.
> 
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1760
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1958
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> ---
>  tests/intel/xe_wedged.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/tests/intel/xe_wedged.c b/tests/intel/xe_wedged.c
> index a4fc53869..a3f7a697f 100644
> --- a/tests/intel/xe_wedged.c
> +++ b/tests/intel/xe_wedged.c
> @@ -26,6 +26,12 @@
>  #include "xe/xe_query.h"
>  #include "xe/xe_spin.h"
>  
> +static void ignore_wedged_in_dmesg(void)
> +{
> +	/* this is needed for igt_runner so it will ignore it */
> +	igt_emit_ignore_dmesg_regex("CRITICAL: Xe has declared device [0-9A-Fa-f:.]* as wedged");
> +}
> +
>  static void force_wedged(int fd)
>  {
>  	igt_debugfs_write(fd, "fail_gt_reset/probability", "100");
> @@ -235,6 +241,8 @@ igt_main
>  					       O_RDWR));
>  
>  		igt_assert_eq(simple_ioctl(fd), 0);
> +		ignore_wedged_in_dmesg();
> +
>  		force_wedged(fd);
>  		igt_assert_neq(simple_ioctl(fd), 0);
>  		fd = rebind_xe(fd);
> @@ -245,6 +253,7 @@ igt_main
>  
>  	igt_subtest_f("wedged-at-any-timeout") {
>  		igt_require(igt_debugfs_exists(fd, "wedged_mode", O_RDWR));
> +		ignore_wedged_in_dmesg();
>  
>  		igt_debugfs_write(fd, "wedged_mode", "2");
>  		simple_hang(fd);
> @@ -268,6 +277,7 @@ igt_main
>  		igt_debugfs_write(fd, "wedged_mode", "2");
>  		igt_assert_eq(simple_ioctl(fd), 0);
>  		igt_debugfs_write(fd, "wedged_mode", "1");
> +		ignore_wedged_in_dmesg();
>  		simple_hang(fd);
>  		igt_assert_eq(simple_ioctl(fd), 0);
>  	}
> -- 
> 2.43.0
>

LGTM, unless will nack this.

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew