kms_rotation_crc: Remove useless comments

[platform/upstream/intel-gpu-tools.git] / tests / gem_basic.c

diff --git a/tests/gem_basic.c b/tests/gem_basic.c
index 2e29c28..f79b066 100644 (file)
--- a/tests/gem_basic.c
+++ b/tests/gem_basic.c
@@ -29,14 +29,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
 #include "drmtest.h"
 
 static void
@@ -45,55 +44,48 @@ test_bad_close(int fd)
        struct drm_gem_close close_bo;
        int ret;
 
-       printf("Testing error return on bad close ioctl.\n");
+       igt_info("Testing error return on bad close ioctl.\n");
 
        close_bo.handle = 0x10101010;
        ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
 
-       assert(ret == -1 && errno == EINVAL);
+       igt_assert(ret == -1 && errno == EINVAL);
 }
 
 static void
 test_create_close(int fd)
 {
-       struct drm_i915_gem_create create;
-       int ret;
+       uint32_t handle;
 
-       printf("Testing creating and closing an object.\n");
+       igt_info("Testing creating and closing an object.\n");
 
-       memset(&create, 0, sizeof(create));
-       create.size = 16 * 1024;
-       ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-       assert(ret == 0);
+       handle = gem_create(fd, 16*1024);
 
-       gem_close(fd, create.handle);
+       gem_close(fd, handle);
 }
 
 static void
 test_create_fd_close(int fd)
 {
-       struct drm_i915_gem_create create;
-       int ret;
+       igt_info("Testing closing with an object allocated.\n");
 
-       printf("Testing closing with an object allocated.\n");
-
-       memset(&create, 0, sizeof(create));
-       create.size = 16 * 1024;
-       ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-       assert(ret == 0);
+       gem_create(fd, 16*1024);
+       /* leak it */
 
        close(fd);
 }
 
-int main(int argc, char **argv)
-{
-       int fd;
+int fd;
 
-       fd = drm_open_any();
-
-       test_bad_close(fd);
-       test_create_close(fd);
-       test_create_fd_close(fd);
-
-       return 0;
+igt_main
+{
+       igt_fixture
+               fd = drm_open_any();
+
+       igt_subtest("bad-close")
+               test_bad_close(fd);
+       igt_subtest("create-close")
+               test_create_close(fd);
+       igt_subtest("create-fd-close")
+               test_create_fd_close(fd);
 }