diff options
| author | Daniel Stone <daniels@collabora.com> | 2018-03-30 16:49:39 +0100 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-04-04 17:01:01 +0300 |
| commit | e861c22db76c1c59547ccb36b668b9204201e81a (patch) | |
| tree | 6f7fbac6ea6ebf0d568614ab3214186c427a28fc /tests/kms_getfb.c | |
| parent | 0e143039fd190f1d22d03f9617af69af3c48b076 (diff) | |
tests/kms_getfb: Use fixtures and subtest groups
Make sure we gently skip when required features (CCS, getfb2) are not
supported on the running kernel, and clean up properly after ourselves.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Antonio Argenziano <antonio.argenziano@intel.com>
Diffstat (limited to 'tests/kms_getfb.c')
| -rw-r--r-- | tests/kms_getfb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/kms_getfb.c b/tests/kms_getfb.c index 5f0bd2a9..81d796a4 100644 --- a/tests/kms_getfb.c +++ b/tests/kms_getfb.c @@ -102,7 +102,7 @@ static void test_handle_input(int fd) add.pitches[0] = 1024*4; add.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024, DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); - igt_assert(add.handles[0]); + igt_require(add.handles[0] != 0); do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add); } @@ -134,6 +134,9 @@ static void test_handle_input(int fd) igt_require(get.fb_id > 0); do_ioctl_err(fd, DRM_IOCTL_MODE_GETFB, &get, ENOENT); } + + igt_fixture + gem_close(fd, add.handles[0]); } static void test_duplicate_handles(int fd) @@ -198,9 +201,11 @@ igt_main igt_fixture fd = drm_open_driver_master(DRIVER_ANY); - test_handle_input(fd); + igt_subtest_group + test_handle_input(fd); - test_duplicate_handles(fd); + igt_subtest_group + test_duplicate_handles(fd); igt_fixture close(fd); |