diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2016-03-01 16:21:13 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2016-04-14 13:54:24 +0100 |
| commit | 6694b6a6699ae3414ad27c7a5271fffdc9d33710 (patch) | |
| tree | 276efb2289af8e865516be10b06be30b8a84da02 /tests/kms_addfb_basic.c | |
| parent | b2671e8e70bc541284f4ad77a3ca204c195bb163 (diff) | |
kms_addfb_basic: Move calls to gem_set_tiling to the subtests
So they don't cause unrelated subtests to be skipped when testing
drivers other than i915.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_addfb_basic.c')
| -rw-r--r-- | tests/kms_addfb_basic.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 79f48885..4d9b1417 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -316,10 +316,8 @@ static void size_tests(int fd) f.fb_id = 0; } - igt_fixture - gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); - igt_subtest("bo-too-small-due-to-tiling") { + gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && errno == EINVAL); } @@ -368,10 +366,8 @@ static void addfb25_tests(int fd) igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); } - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); - igt_subtest("addfb25-X-tiled-mismatch") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; @@ -379,6 +375,7 @@ static void addfb25_tests(int fd) } igt_subtest("addfb25-X-tiled") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; |