Re: [PATCH i-g-t] tests/drv_getparams: Skip instead of fail on EINVAL

[Jeff McGee <jeff.mcgee@intel.com>]

On Tue, Mar 24, 2015 at 11:30:57AM -0700, jeff.mcgee@intel.com wrote:
> From: Jeff McGee <jeff.mcgee@intel.com>
> 
> Avoid failing on older kernels where the GETPARAM interfaces
> don't exist.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89669
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>
> ---

This is very simple. Can we merge it?
-Jeff

>  tests/drv_getparams.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/drv_getparams.c b/tests/drv_getparams.c
> index f383662..1861fb8 100644
> --- a/tests/drv_getparams.c
> +++ b/tests/drv_getparams.c
> @@ -77,6 +77,7 @@ subslice_total(void)
>  	int ret;
>  
>  	ret = getparam(LOCAL_I915_PARAM_SUBSLICE_TOTAL, (int*)&subslice_total);
> +	igt_skip_on_f(ret == -EINVAL, "Interface not supported by kernel\n");
>  
>  	if (ret) {
>  		/*
> @@ -93,9 +94,7 @@ subslice_total(void)
>  		 * fail them if we are here.
>  		*/
>  		} else {
> -			igt_assert_neq(ret, EINVAL); /* request not recognized? */
> -			igt_assert_neq(ret, ENODEV); /* device not supported? */
> -			igt_assert_eq(ret, 0); /* other error? */
> +			igt_assert_eq(ret, 0);
>  		}
>  	} else {
>  		/*
> @@ -115,6 +114,7 @@ eu_total(void)
>  	int ret;
>  
>  	ret = getparam(LOCAL_I915_PARAM_EU_TOTAL, (int*)&eu_total);
> +	igt_skip_on_f(ret == -EINVAL, "Interface not supported by kernel\n");
>  
>  	if (ret) {
>  		/*
> @@ -131,9 +131,7 @@ eu_total(void)
>  		 * fail them if we are here.
>  		*/
>  		} else {
> -			igt_assert_neq(ret, EINVAL); /* request not recognized? */
> -			igt_assert_neq(ret, ENODEV); /* device not supported? */
> -			igt_assert_eq(ret, 0); /* other error? */
> +			igt_assert_eq(ret, 0);
>  		}
>  	} else {
>  		/*
> -- 
> 2.3.3
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx