[igt-dev] [PATCH i-g-t 1/2] tests/kms_pwrite_crtc: Drop fixtures

Daniel Vetter daniel at ffwll.ch
Thu Feb 21 12:39:52 UTC 2019


On Thu, Feb 21, 2019 at 12:43:44AM +0100, Daniel Vetter wrote:
> Not allowed in igt_simple_main, also really doesn't make any sense,
> it's all just one big testcase.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

This and next one merged with Arek's irc r-b.
-Daniel

> ---
>  tests/kms_pwrite_crc.c | 16 ++++++----------
>  1 file changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> index ffd72e4abcc5..9bb5a5dabbf9 100644
> --- a/tests/kms_pwrite_crc.c
> +++ b/tests/kms_pwrite_crc.c
> @@ -176,21 +176,17 @@ igt_simple_main
>  {
>  	igt_skip_on_simulation();
>  
> -	igt_fixture {
> -		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> +	data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
>  
> -		data.devid = intel_get_drm_devid(data.drm_fd);
> +	data.devid = intel_get_drm_devid(data.drm_fd);
>  
> -		kmstest_set_vt_graphics_mode();
> +	kmstest_set_vt_graphics_mode();
>  
> -		igt_require_pipe_crc(data.drm_fd);
> +	igt_require_pipe_crc(data.drm_fd);
>  
> -		igt_display_require(&data.display, data.drm_fd);
> -	}
> +	igt_display_require(&data.display, data.drm_fd);
>  
>  	run_test(&data);
>  
> -	igt_fixture {
> -		igt_display_fini(&data.display);
> -	}
> +	igt_display_fini(&data.display);
>  }
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the igt-dev mailing list