[Intel-gfx] [PATCH i-g-t] tests/prime_mmap: Encapsulate check_for_dma_buf_mmap() in igt_fixture.

[Tiago Vignatti]

I'm not sure this actually fix the root problem. With or without your 
patch applied, I'm seeing the following in lib/tests/test-suite.log:

../../tests/prime_mmap:
   Checking invalid option handling...
   Checking valid option handling...
   Checking subtest enumeration...
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Test assertion failure 
function gem_create, file ../../lib/ioctl_wrappers.c:501:
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Failed assertion: 
drmIoctl((fd), ((((2U|1U) << (((0+8)+8)+14)) | ((('d')) << (0+8)) | 
(((0x40 + 0x1b)) << 0) | ((((sizeof(struct drm_i915_gem_create)))) << 
((0+8)+8)))), (&create)) == 0
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Last errno: 25, 
Inappropriate ioctl for device
(prime_mmap:24023) ioctl-wrappers-CRITICAL: error: -1 != 0
Test prime_mmap failed.
**** DEBUG ****
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Test assertion failure 
function gem_create, file ../../lib/ioctl_wrappers.c:501:
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Failed assertion: 
drmIoctl((fd), ((((2U|1U) << (((0+8)+8)+14)) | ((('d')) << (0+8)) | 
(((0x40 + 0x1b)) << 0) | ((((sizeof(struct drm_i915_gem_create)))) << 
((0+8)+8)))), (&create)) == 0
(prime_mmap:24023) ioctl-wrappers-CRITICAL: Last errno: 25, 
Inappropriate ioctl for device
(prime_mmap:24023) ioctl-wrappers-CRITICAL: error: -1 != 0
****  END  ****
prime_mmap: ../../lib/igt_core.c:1014: igt_fail: Assertion 
`!test_with_subtests || in_fixture' failed.
Received signal SIGABRT.
Aborted (core dumped)

Tiago

On 02/12/2016 11:32 AM, Marius Vlad wrote:
> This unbreaks distcheck target that in turn runs each test with --list-subtests.
>
> Signed-off-by: Marius Vlad <marius.c.vlad at intel.com>
> ---
>   tests/prime_mmap.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/prime_mmap.c b/tests/prime_mmap.c
> index 29a0cfd..1ea61c2 100644
> --- a/tests/prime_mmap.c
> +++ b/tests/prime_mmap.c
> @@ -504,10 +504,10 @@ igt_main
>
>   	igt_fixture {
>   		fd = drm_open_driver(DRIVER_INTEL);
> +		igt_skip_on((check_for_dma_buf_mmap() != 0));
>   		errno = 0;
>   	}
>
> -	igt_skip_on((check_for_dma_buf_mmap() != 0));
>
>   	for (i = 0; i < ARRAY_SIZE(tests); i++) {
>   		igt_subtest(tests[i].name)
>