kselftests: dmabuf-heaps: Softly fail if don't find a vgem device
authorJohn Stultz <john.stultz@linaro.org>
Fri, 29 Jan 2021 03:05:12 +0000 (03:05 +0000)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 8 Feb 2021 23:25:39 +0000 (16:25 -0700)
While testing against a vgem device is helpful for testing importing
they aren't always configured in, so don't make it a fatal failure.

Cc: Shuah Khan <shuah@kernel.org>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Laura Abbott <labbott@kernel.org>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: Daniel Mentz <danielmentz@google.com>
Cc: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

index 46f6759..8cedd53 100644 (file)
@@ -184,15 +184,14 @@ static int test_alloc_and_import(char *heap_name)
        if (importer_fd < 0) {
                ret = importer_fd;
                printf("Failed to open vgem\n");
-               goto out;
-       }
-
-       ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle);
-       if (ret < 0) {
-               printf("Failed to import buffer\n");
-               goto out;
+       } else {
+               ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle);
+               if (ret < 0) {
+                       printf("Failed to import buffer\n");
+                       goto out;
+               }
+               printf("import passed\n");
        }
-       printf("import passed\n");
 
        ret = dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START);
        if (ret < 0) {